 钮海涛
|
51746154ba
|
合并dev到test
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
钮海涛
|
8d38a297d2
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
6dd429d328
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
 王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
钮海涛
|
8ae3c65cb3
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
dcc23e56cd
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
2bbc0bea66
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
1581e8b86c
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
c980c6c87c
|
三力士演示demo
|
5 years ago |
|
钮海涛
|
32eb9dc797
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
629817ddef
|
三力士数据排程
|
5 years ago |
|
钮海涛
|
9475667e74
|
Finish Task #2134 Cost: 8h
|
5 years ago |
|
钮海涛
|
aeb347b1fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
ce020cc1ab
|
Start Task #2134 Cost: 8h
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
|
wynne1005
|
ba1ba8bc0f
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
8623a5a13d
|
还原pom
|
5 years ago |
|
wynne1005
|
b75347ffc1
|
还原pom
|
5 years ago |
|
钮海涛
|
9f349cd42c
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
9dd7c54678
|
修复启动问题
|
5 years ago |
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
414b811871
|
修复启动问题
|
5 years ago |
|
钮海涛
|
7414b76d85
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
6061f89d43
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
7b83f8fa50
|
新增aps序列化id
|
5 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
6 years ago |
|
钮海涛
|
c344f017a9
|
修复sonar上的问题
|
6 years ago |
|
王杰
|
786c442d55
|
解决冲突
|
6 years ago |
|
钮海涛
|
c1241bd6c5
|
修复版本问题
|
6 years ago |
|
钮海涛
|
53a421b3b9
|
修复版本问题
|
6 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
6 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
6 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
6 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
6 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
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 |
|
钮海涛
|
3b987436d8
|
新增LES管理功能
|
6 years ago |