paojiangxigua
|
598c65d80c
|
21701朱良飞119
|
2024-01-19 18:09:43 +08:00 |
|
华鱼燕
|
7a6dd84aef
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 18:07:26 +08:00 |
|
华鱼燕
|
c6b889b8bc
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 18:06:36 +08:00 |
|
华鱼燕
|
c6accad34e
|
21690华鱼燕
|
2024-01-19 18:06:12 +08:00 |
|
暗月疯子
|
62ecab6f89
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 18:05:04 +08:00 |
|
暗月疯子
|
8bf0b45b08
|
前端提交
|
2024-01-19 18:03:52 +08:00 |
|
ansmycode
|
b79a7b7508
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 18:00:15 +08:00 |
|
ansmycode
|
f061a0ff59
|
20240119实习生黄梓航提交
|
2024-01-19 18:00:03 +08:00 |
|
LAPTOP-G4EQC14S\xingyue
|
6d7e01854a
|
21710_丁明皓
|
2024-01-19 17:59:48 +08:00 |
|
ISHAO
|
257d5c4bcf
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:58:49 +08:00 |
|
RanbowPY
|
3624b1c014
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:58:22 +08:00 |
|
ISHAO
|
89b3d8dfe6
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts:
# SRC/MESWin/SYS6/21695韦海桑/backend/wsSXS/wsSXS.csproj.user
# SRC/MEStc_SXS/MEStc_SXS.csproj
# SRC/wsSXS/wsSXS.csproj
|
2024-01-19 17:58:21 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
7f38507624
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:56:55 +08:00 |
|
LAPTOP-0K9GR3I2\86158
|
a831514277
|
21671_田静
|
2024-01-19 17:56:39 +08:00 |
|
RanbowPY
|
bd0eeef93f
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:55:49 +08:00 |
|
MaP1e_G
|
5f23302dac
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:55:03 +08:00 |
|
MaP1e_G
|
5e379c175b
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:54:38 +08:00 |
|
红烧狮子头
|
a8c2655b62
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:54:22 +08:00 |
|
红烧狮子头
|
e8f2e3103a
|
唐祝超21703
|
2024-01-19 17:53:53 +08:00 |
|
怀念66
|
e979a1d824
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:53:40 +08:00 |
|
MaP1e_G
|
fe182d7c06
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:53:39 +08:00 |
|
RanbowPY
|
2dcabe99a9
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:53:32 +08:00 |
|
MaP1e_G
|
0fb8da50c6
|
【修改】21706上傳前端
|
2024-01-19 17:53:20 +08:00 |
|
RanbowPY
|
ab4c11bc53
|
【前端页面】21702裴元浩
|
2024-01-19 17:53:15 +08:00 |
|
王政
|
bea9699359
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:51:45 +08:00 |
|
怀念66
|
1e36f8b723
|
【修改】实习生21674刘超
|
2024-01-19 17:51:19 +08:00 |
|
lixli
|
ec84c4de4c
|
Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
|
2024-01-19 17:48:54 +08:00 |
|
lixli
|
763528e5ea
|
实习生21685李孝龙
|
2024-01-19 17:48:19 +08:00 |
|
|
|
c39f1c62c3
|
【实习生考试】进出站前端文件
|
2024-01-19 17:48:00 +08:00 |
|
王政
|
03588900fb
|
[提交前端文件]
|
2024-01-19 17:43:29 +08:00 |
|
14278/caihao
|
e9f9b0c63e
|
模板上传
|
2024-01-18 17:47:59 +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 |
|
