administrator
|
ebbb1b9f34
|
修改pojo版本号-供优化使用
|
1 year ago |
|
administrator
|
e73b97cd47
|
动态表单调用微服务挂载菜单防止二次挂载
|
2 years ago |
jun
|
7fc0619f94
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
|
2 years ago |
castle.zang
|
76d35b42e1
|
动态form + ptl_pcn亮灯修改
|
3 years ago |
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
3 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
3 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/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-screen/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
sonar-project.properties
|
4 years ago |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
nies
|
5da810fb20
|
Merge branch 'test' into dev
|
4 years ago |
|
puxiao.liao
|
ad1f48c28c
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
castle.zang
|
52b70927b3
|
ptl亮灯增加backoff字段
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
|
puxiao.liao
|
a4bc97c5da
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
joke.wang
|
8b5447f5ca
|
停机统计报表
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
wynne1005
|
69d872be7e
|
Merge branch 'dev' into test
|
4 years ago |
|
puxiao.liao
|
2acc57e72d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
470b05ebf0
|
北京ptl亮灯
|
4 years ago |
 王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
许心洁
|
3cfa736132
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
joke.wang
|
acaeb348e1
|
标签基础页面
|
4 years ago |
 曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
 钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
钮海涛
|
baed7db4ed
|
合并dev代码
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
|
wynne1005
|
db87c0c32f
|
pom版本
|
5 years ago |
|
钮海涛
|
b9283ec075
|
合并dev代码
|
5 years ago |
|
钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
wynne1005
|
1e9f1a5c47
|
质量检测 1
|
5 years ago |
|
钮海涛
|
729a7b6990
|
合并冲突
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
宋军超
|
6aaa26b192
|
修改海纳川问题
|
5 years ago |
|
宋军超
|
731b1c60ee
|
修改海纳川问题
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
王杰
|
784cd87c71
|
ptl
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |