Commit Graph

7 Commits

Author SHA1 Message Date
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
华鱼燕
4457514143 21690华鱼燕 2024-01-17 17:23:47 +08:00
24c623d98b 【修改】代码提交 2024-01-17 17:00:20 +08:00
f5f65379fc 【修改】代码添加 2024-01-17 16:35:18 +08:00
ISHAO
5355895746 【修改】实习生练习 2024-01-17 16:05:54 +08:00
14278/caihao
e5870e88e6 【修改】样例上传 2024-01-15 14:20:27 +08:00