汪云昊
|
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 |
wei.peng
|
cc7572ddd0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
 钮海涛
|
82d5332861
|
修复POM文件问题
|
5 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
5 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
5 years ago |
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wei.peng
|
02b5fc715a
|
添加对象序列化
|
5 years ago |
|
wei.peng
|
c8c7c73336
|
自定义报表 布局,元素,报表 功能优化完成
|
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 |
luweihao
|
12579c7a14
|
还原pom
|
5 years ago |
|
wei.peng
|
8a4974f369
|
自定义报表 调用调整
|
5 years ago |
|
wei.peng
|
d8d47541df
|
自定义报表调整
|
5 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
5 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
5 years ago |
 王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
jenkins
|
6d9a2b5b80
|
2019年11月27日12:14:44
|
6 years ago |
|
wei.peng
|
84d341aa87
|
Jenkins 自动合并代码测试
|
6 years ago |
|
汪云昊
|
f5a0f24355
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
a0f1eab0f9
|
Jenkins 自动合并代码测试
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
WYnneaoapc
|
5e72d98ad8
|
提交
|
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 |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
0aaa8112a8
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
yunhao.wang
|
0171439464
|
版本发布 2019年3月26日22:47:53
|
6 years ago |
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
wei.peng
|
8ec8dba414
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
4055e6fa76
|
字典调整
|
6 years ago |
|
Silliter
|
de5760bba1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
093a67f541
|
条码规则解析Demo
元素名称唯一校验
文件上传优化
|
6 years ago |