fenghongdan
|
dd4e6c82e6
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MESWin/ENT/ET_TestData14278/ET_Subcontractor.vbproj.vspscc
# SRC/MESWin/ENT/ET_TestData14278/My Project/Application.Designer.vb
# SRC/MESWin/ENT/ET_TestData14278/My Project/Application.myapp
# SRC/MESWin/ENT/ET_TestData14278/My Project/AssemblyInfo.vb
# SRC/MESWin/ENT/ET_TestData14278/My Project/BuildIncrementVersionInfo.vb
# SRC/MESWin/ENT/ET_TestData14278/My Project/Resources.Designer.vb
# SRC/MESWin/ENT/ET_TestData14278/My Project/Resources.resx
# SRC/MESWin/ENT/ET_TestData14278/My Project/Settings.Designer.vb
# SRC/MESWin/ENT/ET_TestData14278/My Project/Settings.settings
# SRC/MESWin/ENT/ET_TestData14278/My Project/licenses.licx
# SRC/MESWin/ENT/ET_TestData14278/iMES.snk
# SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.sln
# SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj
# SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj.user
# SRC/MESWin/SYS1/ET_21674/ET_Subcontractor.vbproj.vspscc
# SRC/MESWin/SYS1/ET_21674/My Project/Application.Designer.vb
# SRC/MESWin/SYS1/ET_21674/My Project/Application.myapp
# SRC/MESWin/SYS1/ET_21674/My Project/AssemblyInfo.vb
# SRC/MESWin/SYS1/ET_21674/My Project/BuildIncrementVersionInfo.vb
# SRC/MESWin/SYS1/ET_21674/My Project/Resources.Designer.vb
# SRC/MESWin/SYS1/ET_21674/My Project/Resources.resx
# SRC/MESWin/SYS1/ET_21674/My Project/Settings.Designer.vb
# SRC/MESWin/SYS1/ET_21674/My Project/Settings.settings
# SRC/MESWin/SYS1/ET_21674/My Project/licenses.licx
# SRC/MESWin/SYS1/ET_21674/frmSubcontractor.resx
# SRC/MESWin/SYS1/ET_21674/frmSubcontractor.vb
# SRC/MESWin/SYS1/ET_21674/frmSubcontractorContDef.resx
# SRC/MESWin/SYS1/ET_21674/frmSubcontractorContDef.vb
# SRC/MESWin/SYS1/ET_21674/frmSubcontractorDef.resx
# SRC/MESWin/SYS1/ET_21674/frmSubcontractorDef.vb
# SRC/MESWin/SYS1/ET_21674/frmTeacherContDef.resx
# SRC/MESWin/SYS1/ET_21674/frmTeacherContDef.vb
# SRC/MESWin/SYS1/ET_21674/frmTeacherDef.resx
# SRC/MESWin/SYS1/ET_21674/frmTeacherDef.vb
# SRC/MESWin/SYS1/ET_21674/iMES.snk
# SRC/MESWin/SYS2/SYSENT21687/ET_Subcontractor.sln
# SRC/MESWin/SYS2/SYSENT21687/ET_Subcontractor.vbproj
# SRC/MESWin/SYS2/SYSENT21687/frmSubcontractor.resx
# SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorContDef.resx
# SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorContDef.vb
# SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorDef.resx
# SRC/MESWin/SYS2/SYSENT21687/frmSubcontractorDef.vb
# SRC/MESWin/SYS4/21691/ET_Subcontractor.sln
# SRC/MESWin/SYS4/21691/ET_Subcontractor.vbproj
# SRC/MESWin/SYS4/21691/ET_Subcontractor.vbproj.vspscc
# SRC/MESWin/SYS4/21691/My Project/Application.Designer.vb
# SRC/MESWin/SYS4/21691/My Project/Application.myapp
# SRC/MESWin/SYS4/21691/My Project/AssemblyInfo.vb
# SRC/MESWin/SYS4/21691/My Project/BuildIncrementVersionInfo.vb
# SRC/MESWin/SYS4/21691/My Project/Resources.Designer.vb
# SRC/MESWin/SYS4/21691/My Project/Resources.resx
# SRC/MESWin/SYS4/21691/My Project/Settings.Designer.vb
# SRC/MESWin/SYS4/21691/My Project/Settings.settings
# SRC/MESWin/SYS4/21691/My Project/licenses.licx
# SRC/MESWin/SYS4/21691/frmSubcontractor.resx
# SRC/MESWin/SYS4/21691/frmSubcontractor.vb
# SRC/MESWin/SYS4/21691/frmSubcontractorContDef.resx
# SRC/MESWin/SYS4/21691/frmSubcontractorContDef.vb
# SRC/MESWin/SYS4/21691/frmSubcontractorDef.resx
# SRC/MESWin/SYS4/21691/frmSubcontractorDef.vb
# SRC/MESWin/SYS4/21691/iMES.snk
# SRC/MEStc_SXS/tcENT_21674/clsENT_21674.cs
# SRC/wsSXS/wxENT_21674/wsENT_21674.cs
|
2024-01-17 17:34:55 +08:00 |
|
fenghongdan
|
33113c6fa3
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MESWin/ENT/ET_Subcontractor/ET_Subcontractor.vbproj
# SRC/MESWin/ENT/ET_Subcontractor/My Project/Resources.Designer.vb
# SRC/MESWin/ENT/ET_Subcontractor/My Project/Settings.Designer.vb
# SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorContDef.vb
# SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorDef.vb
# SRC/MEStc_SXS/tcENT/clsENT.cs
# SRC/wsSXS/wsSXS.csproj.user
# SRC/wsSXS/wxENT/wsENT.cs
|
2024-01-17 17:32:48 +08:00 |
|
怀念66
|
593e0c06a2
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MEStc_SXS/MEStc_SXS.csproj
# SRC/wsSXS/wsSXS.csproj
# SRC/wsSXS/wsSXS.csproj.user
|
2024-01-17 17:25:38 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
20eec3edca
|
21671_田静
|
2024-01-17 17:14:11 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
5ae2b83362
|
21671_田静
|
2024-01-17 17:12:03 +08:00 |
|
怀念66
|
0024300e81
|
qq
|
2024-01-17 17:08:07 +08:00 |
|
fenghongdan
|
80e73dd72b
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MEStc_SXS/tcENT/clsENT.cs
# SRC/wsSXS/wxENT/wsENT.cs
|
2024-01-17 17:04:14 +08:00 |
|
|
|
a64b799316
|
【修改】代码提交
|
2024-01-17 16:59:25 +08:00 |
|
fenghongdan
|
8694cd2074
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 16:54:10 +08:00 |
|
|
|
ef94da9435
|
【修改】提交代码
|
2024-01-17 16:50:46 +08:00 |
|
|
|
f5f65379fc
|
【修改】代码添加
|
2024-01-17 16:35:18 +08:00 |
|
怀念66
|
397750e69d
|
实习生21674刘超
|
2024-01-17 16:35:15 +08:00 |
|
红烧狮子头
|
d89d49780d
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MEStc_SXS/MEStc_SXS.csproj
# SRC/wsSXS/wsSXS.csproj
|
2024-01-17 16:26:11 +08:00 |
|
fenghongdan
|
22217282c8
|
【修改】冯虹丹21691主档
|
2024-01-17 16:19:27 +08:00 |
|
红烧狮子头
|
e2d245dad2
|
唐祝超_217031月16日作业
|
2024-01-17 16:17:54 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
ae2b188efd
|
21671田静_作业
|
2024-01-17 16:14:54 +08:00 |
|
14278/caihao
|
f4e3b364ed
|
【修改】实习生练习主档
|
2024-01-17 15:58:55 +08:00 |
|
14278/caihao
|
e5870e88e6
|
【修改】样例上传
|
2024-01-15 14:20:27 +08:00 |
|
