 钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
汪云昊
|
a52646a65d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
|
5 years ago |
|
汪云昊
|
26cf4c5e92
|
feat:mongo模块化
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
 王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
|
钮海涛
|
6033695b99
|
修复合并版本问题
|
5 years ago |
wynne1005
|
085f15427d
|
还原pom
|
5 years ago |
|
wynne1005
|
dfa993b9e9
|
还原pom
|
5 years ago |
|
wynne1005
|
15f0a37508
|
还原pom
|
5 years ago |
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
钮海涛
|
4921d55bda
|
修复版本问题
|
5 years ago |
|
钮海涛
|
b303cf9a14
|
修复合并问题
|
5 years ago |
|
wynne1005
|
5ef88c80c0
|
提测合并 还原pom
|
5 years ago |
|
钮海涛
|
53a421b3b9
|
修复版本问题
|
5 years ago |
|
钮海涛
|
94e9b2ffec
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
王杰
|
029763feb1
|
pom
|
5 years ago |
|
王杰
|
30fcf4f23f
|
pom冲突
|
5 years ago |
|
汪云昊
|
717f268c28
|
POJO版本号还原
|
5 years ago |
|
汪云昊
|
7f2c372229
|
MDM POJO
|
5 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
5 years ago |
|
wei.peng
|
aa1f7a2845
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
5 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
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
wynne1005
|
c8af9ed6f8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
965a8d37cd
|
删除多余maven profile
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
 曾贞一
|
9b3dd79655
|
【冲突解决】
|
5 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
5 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |