汪云昊
|
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 |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
汪云昊
|
aeda8d8287
|
版本调整
|
5 years ago |
|
汪云昊
|
3069c5bf18
|
查询条件补充
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
5 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
5 years ago |
 曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
5 years ago |
|
汪云昊
|
41a39990f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
b0a4eccca4
|
禁用启用，软删
|
5 years ago |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
 王杰
|
999aae6fc0
|
解决冲突
|
5 years ago |
|
曾贞一
|
2625c2cb0f
|
【修改 TSET-pom.xml】
|
5 years ago |
|
汪云昊
|
a3ecc3132f
|
表单约束管理
|
5 years ago |
|
王杰
|
80ca438ce3
|
test合并到dev解决pom冲突
|
5 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
汪云昊
|
a510196022
|
软删合同禁用启用功能
|
5 years ago |
jenkins
|
83a9b74c43
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
05d6f132ce
|
表单拾取
任务检查功能优化
|
5 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
5 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
5 years ago |
|
王杰
|
f8356637ae
|
更新 'modules/i3plus-pojo-form/pom.xml'
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
crish
|
4a1ad40dfa
|
Merge branch 'dev' into test
|
6 years ago |
wei.peng
|
0ac5232eb0
|
自定义表单 默认值取值方式修改
|
6 years ago |
|
wei.peng
|
e921bb72d2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
|
6 years ago |
|
汪云昊
|
029d7eac62
|
软适配model
|
6 years ago |
|
wei.peng
|
a59f95080c
|
自定义表单-同步对象功能优化
自定义表单-动态页面数据导出
|
6 years ago |
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
WYnneaoapc
|
5e72d98ad8
|
提交
|
6 years ago |
|
WYnneaoapc
|
4ff3677fba
|
Merge branch 'test' into dev
|
6 years ago |
|
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
7002ac5a8a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
69525fbaa9
|
表单菜单排序
|
6 years ago |
|
曾贞一
|
fbe8544a02
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
66f49f3fdc
|
自定义表单功能调整
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
于学杰
|
6598a829e0
|
Merge branch 'dev'
|
6 years ago |
jenkins
|
49a936c660
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7f1ef0bca7
|
自定义报表表单打通， 用户在线设置功能优化
|
6 years ago |
peter.pan
|
c02d22ecba
|
Merge branch 'test'
|
6 years ago |