b0b07437d6
还原pom
5 years ago
60c1f6ecab
还原pom
5 years ago
47ae0b46ef
还原pom
5 years ago
王杰
1d775acd69
ptl IF_拣货数据
5 years ago
王杰
e063608cb1
ptl IF_拣货数据
5 years ago
王杰
9675274a0d
ptl
5 years ago
王杰
c39c9b6f70
ptl
5 years ago
王杰
b946ca7fa1
[任务：2066，状态机异常处理]
5 years ago
王杰
6232d14e61
[任务：2066，状态机异常处理]
5 years ago
王杰
215ffc080b
ptl
5 years ago
85f99fcdfa
提测 还原pom
5 years ago
b43317c11a
还原pom
5 years ago
王杰
5ccc6c4408
andon
5 years ago
8955fd2f4d
mes提测 还原pom
6 years ago
23754d3f18
mes提测 还原pom
6 years ago
99d3c9d721
提测合并 还原pom
6 years ago
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
王杰
786c442d55
解决冲突
6 years ago
钮海涛
c1241bd6c5
修复版本问题
6 years ago
钮海涛
53a421b3b9
修复版本问题
6 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
6 years ago
王杰
029763feb1
pom
6 years ago
王杰
fc99ee8914
pojo 序列化
6 years ago
王杰
30fcf4f23f
pom冲突
6 years ago
717f268c28
POJO版本号还原
6 years ago
王杰
a6e9b90026
pom
6 years ago
王杰
de9017ca5c
冲突
6 years ago
王杰
eaecf4b4b7
pom
6 years ago
王杰
7d192b36a6
pom冲突
6 years ago
钮海涛
005d0f7f86
修复合并问题
6 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
6 years ago
8aab106aa9
合并代码 pom 冲突
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-docker.properties
6 years ago
王杰
cace95fbed
ptl
6 years ago
钮海涛
3fbf532c84
修复pom版本问题
6 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
6 years ago
钮海涛
2e2ee2cc6c
Merge branch 'test' into dev
6 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
6 years ago
王杰
9da9a568f5
mes
6 years ago
d6fe718e4c
Merge branch 'dev' into test
6 years ago
王杰
0a14b533d7
任务1659 返工返修
6 years ago
钮海涛
efe083a9da
修复版本号
6 years ago
王杰
cba7ee3d0d
[任务：1522，ptl流程设计]
6 years ago
王杰
c6aefc89e7
test合并dev解决ct
6 years ago
王杰
94fed3b9b2
Merge branch 'test' into dev
6 years ago
王杰
b1018dbd39
[平台；]
6 years ago
钮海涛
288fb4a16b
修改POM版本号
6 years ago
2772ea6a2f
Merge remote-tracking branch 'remotes/origin/dev' into test
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
8a8c3ee34d
pom版本调整
6 years ago
钮海涛
1d16e2d938
解决合并冲突
6 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
6 years ago
wynne1005
王杰
wei.peng
钮海涛
汪云昊
贾文涛