whs
|
8ba2e4cce4
|
【考试提交前端2024/01/19】韦海桑
|
2024-01-19 17:58:07 +08:00 |
|
14278/caihao
|
af7d978fe2
|
【修改模板】
|
2024-01-18 14:07:25 +08:00 |
|
14278/caihao
|
a1739f554d
|
【修改】重新上传模板
|
2024-01-18 14:03:02 +08:00 |
|
耿磊
|
e4d083ad9e
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/wsSXS/wsSXS.csproj.user
|
2024-01-17 18:12:06 +08:00 |
|
王政
|
ff0823868d
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 18:03:03 +08:00 |
|
耿磊
|
896ab69122
|
代码提交21676
|
2024-01-17 18:02:00 +08:00 |
|
MaP1e_G
|
2ec2bd666b
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:56:40 +08:00 |
|
MaP1e_G
|
ab20ccec9b
|
【修改】代码提交
|
2024-01-17 17:56:28 +08:00 |
|
王政
|
0d2643c9f4
|
xiugaiii
|
2024-01-17 17:56:17 +08:00 |
|
LAPTOP-G4EQC14S\xingyue
|
b1df722123
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:53:21 +08:00 |
|
DESKTOP-S5Q9G6M\Tao
|
b5eea3213e
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:53:01 +08:00 |
|
DESKTOP-S5Q9G6M\Tao
|
c366aae0d1
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:51:49 +08:00 |
|
LAPTOP-G4EQC14S\xingyue
|
4a80b5397c
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:50:16 +08:00 |
|
王政
|
e4812df29d
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:48:56 +08:00 |
|
LAPTOP-G4EQC14S\xingyue
|
d769d39552
|
【修改】实习生练习提交
|
2024-01-17 17:45:43 +08:00 |
|
王政
|
bf2714542c
|
no message
|
2024-01-17 17:42:50 +08:00 |
|
DESKTOP-S5Q9G6M\Tao
|
882c5254eb
|
[修改]21699姜涛实习生练习主档
|
2024-01-17 17:42:20 +08:00 |
|
whs
|
806fc2d23e
|
【21695实习生提交作业1.16】
|
2024-01-17 17:41:53 +08:00 |
|
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 |
|
怀念66
|
dc359766c3
|
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:33:31 +08:00 |
|
fenghongdan
|
65e3e2d1d9
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/wsSXS/wsSXS.csproj.user
|
2024-01-17 17:33:25 +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 |
|
华鱼燕
|
4457514143
|
21690华鱼燕
|
2024-01-17 17:23:47 +08:00 |
|
华鱼燕
|
f0a3063565
|
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 17:23:05 +08:00 |
|
华鱼燕
|
41df11bf22
|
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 17:20:44 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
7a91e232e7
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 17:14:34 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
20eec3edca
|
21671_田静
|
2024-01-17 17:14:11 +08:00 |
|
暗月疯子
|
eecc1c2517
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/wsSXS/wsSXS.csproj
|
2024-01-17 17:13:16 +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 |
|
暗月疯子
|
d7d2ca1c73
|
21708提交
|
2024-01-17 17:05:31 +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 |
|
|
|
24c623d98b
|
【修改】代码提交
|
2024-01-17 17:00:20 +08:00 |
|
|
|
a64b799316
|
【修改】代码提交
|
2024-01-17 16:59:25 +08:00 |
|
wwaitt123
|
42de248d2d
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/wsSXS/wsSXS.csproj.user
|
2024-01-17 16:54:48 +08:00 |
|
wwaitt123
|
e7dfcd5bd0
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/wsSXS/wsSXS.csproj
|
2024-01-17 16:54:13 +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 |
|
ISHAO
|
031875b7db
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 16:54:01 +08:00 |
|
|
|
64c2c2f1db
|
【修改】提交代码
|
2024-01-17 16:53:22 +08:00 |
|
|
|
ef94da9435
|
【修改】提交代码
|
2024-01-17 16:50:46 +08:00 |
|
wwaitt123
|
629c4fcd69
|
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:48:30 +08:00 |
|
ansmycode
|
2eda2f0b8c
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MEStc_SXS/MEStc_SXS.csproj
|
2024-01-17 16:46:59 +08:00 |
|
ISHAO
|
a7ee59dec6
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MESWin/ENT/ET_Subcontractor/My Project/BuildIncrementVersionInfo.vb
# SRC/MEStc_SXS/tcENT/clsENT.cs
|
2024-01-17 16:46:53 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
5cdee0b986
|
21671_田静——作业
|
2024-01-17 16:40:17 +08:00 |
|
ISHAO
|
ba422318ac
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-17 16:37:48 +08:00 |
|
|
|
f5f65379fc
|
【修改】代码添加
|
2024-01-17 16:35:18 +08:00 |
|
怀念66
|
397750e69d
|
实习生21674刘超
|
2024-01-17 16:35:15 +08:00 |
|
ansmycode
|
a6c36d080d
|
实习生黄梓航上传
|
2024-01-17 16:32:07 +08:00 |
|
wwaitt123
|
2fe661a523
|
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:30:39 +08:00 |
|
