Commit Graph

11 Commits

Author SHA1 Message Date
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
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
24c623d98b 【修改】代码提交 2024-01-17 17:00:20 +08:00
a64b799316 【修改】代码提交 2024-01-17 16:59:25 +08:00
64c2c2f1db 【修改】提交代码 2024-01-17 16:53:22 +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
红烧狮子头
e2d245dad2 唐祝超_217031月16日作业 2024-01-17 16:17:54 +08:00
LAPTOP-0K9GR3I2\86158
ae2b188efd 21671田静_作业 2024-01-17 16:14:54 +08:00
ISHAO
5355895746 【修改】实习生练习 2024-01-17 16:05:54 +08:00
14278/caihao
e5870e88e6 【修改】样例上传 2024-01-15 14:20:27 +08:00