Commit Graph

18 Commits

Author SHA1 Message Date
ISHAO
031875b7db Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-17 16:54:01 +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
ISHAO
ba422318ac Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-17 16:37:48 +08:00
ansmycode
a6c36d080d 实习生黄梓航上传 2024-01-17 16:32:07 +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
ISHAO
5a652d99d4 【实习生练习】邵思成21684 2024-01-17 16:21:29 +08:00
红烧狮子头
e2d245dad2 唐祝超_217031月16日作业 2024-01-17 16:17:54 +08:00
lixli
23b75f485a Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc 2024-01-17 16:16:28 +08:00
LiMaiQi
d2c31b7352 【修改】实习生21685李孝龙 2024-01-17 16:12:50 +08:00
29a457ec7d 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:11:21 +08:00
ISHAO
5355895746 【修改】实习生练习 2024-01-17 16:05:54 +08:00
LiMaiQi
18272ec95a 【修改】实习生21685李孝龙 2024-01-17 16:03:04 +08:00
69934cdce3 【修改】实习生练习主档 2024-01-17 16:02:58 +08:00
14278/caihao
f4e3b364ed 【修改】实习生练习主档 2024-01-17 15:58:55 +08:00
14278/caihao
3991de18d8 【修改】文件夹上传 2024-01-16 12:24:44 +08:00
14278/caihao
e5870e88e6 【修改】样例上传 2024-01-15 14:20:27 +08:00
1ce16787a9 Initial commit 2024-01-15 10:57:41 +08:00