6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
钮海涛
53a421b3b9
修复版本问题
5 years ago
c288b54660
查询优化
5 years ago
王杰
a6e9b90026
pom
5 years ago
王杰
de9017ca5c
冲突
5 years ago
王杰
eaecf4b4b7
pom
5 years ago
王杰
7d192b36a6
pom冲突
5 years ago
钮海涛
005d0f7f86
修复合并问题
5 years ago
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
fa42a25b96
异常处理优化
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
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
44696061ee
修改pom文件为最新
5 years ago
02b5fc715a
添加对象序列化
5 years ago
c8c7c73336
自定义报表 布局,元素,报表 功能优化完成
5 years ago
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
12579c7a14
还原pom
5 years ago
8a4974f369
自定义报表 调用调整
5 years ago
d8d47541df
自定义报表调整
5 years ago
f768247c4f
代码合并 2019-12-30 15:59:52
5 years ago
3b7b374b23
自定报表对象模型调整
5 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
6d9a2b5b80
2019年11月27日12:14:44
6 years ago
84d341aa87
Jenkins 自动合并代码测试
6 years ago
f5a0f24355
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a0f1eab0f9
Jenkins 自动合并代码测试
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
9f9874902d
冲突解决
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
c901f18f89
pom版本还原
6 years ago
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
49a936c660
Merge branch 'dev' into test
6 years ago
7f1ef0bca7
自定义报表表单打通， 用户在线设置功能优化
6 years ago
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
6ebc22e6cc
master分支配置调整
6 years ago
850b372ab4
Merge remote-tracking branch 'origin/dev' into test
6 years ago
0aaa8112a8
自定义表单拦截器开发1.1完成
...
优化动态表单页面接口
6 years ago
3a5f43f97b
删除iml文件
6 years ago
0171439464
版本发布 2019年3月26日22:47:53
6 years ago
111c6177c9
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ea2eb6103d
优化调整
6 years ago
8ec8dba414
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
4055e6fa76
字典调整
6 years ago
de5760bba1
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
093a67f541
条码规则解析Demo
...
元素名称唯一校验
文件上传优化
6 years ago
0a5c19ebe5
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
03fe15e2f4
自定义报表优化
6 years ago
cc4484a562
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
e28dfa55c6
自定义报表Bug 修复
6 years ago
1bdc307a1b
自定义报表 折线图功能完成
6 years ago
4b4fb30248
自定义报表 饼图功能完成
6 years ago
44676161ad
自定义模板优化
...
echarts 工具新增
6 years ago
adfe3cb2e6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ba36cfecd5
报表优化
...
国际化接口
6 years ago
e5d1f3cf07
报表优化
6 years ago
b01e479cb3
报表优化
...
impp压测接口优化
消息队列非空验证
单号管理增加状态
6 years ago
a2bbd4b5f0
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6cffcaecac
目录管理 优化
6 years ago
c61d0882c5
模板管理生成HTML 完成
6 years ago
4769c6bc29
报表元素管理
6 years ago
1bf0925ded
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
42f00211c1
模板确认接口完成
...
模板状态扭转功能完成
6 years ago
dbe4933fbb
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
07d0661205
报表元素调整
6 years ago
ae08c3ef76
模板管理 后台功能完成
6 years ago
19a8189b05
模板管理 后台功能完成
6 years ago
2bd16137bd
模板管理 后台功能完成
6 years ago
40d37ed5c9
文件微服务接口
...
报表元素 上传图片文件
6 years ago
d0cee703fe
测试邮件发送
6 years ago
e35113c519
报表排版实体变更
6 years ago
1e43b2e36f
模板Pojo 调整
6 years ago
324c7aa413
自定义报表 目录功能 联调完成
6 years ago
86da7bcdac
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
dd9c35e6e1
模板Pojo 调整
...
模板 枚举 添加
添加枚举接口
6 years ago
7d8feb77cd
报表布局接口
...
block service切面
6 years ago
c5f3897bc9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
7ccd5613b3
目录联调Bug 修复
...
模板Pojo 创建
模板枚举定义
6 years ago
d9d7f5eea1
report url 调整
6 years ago
504c3e871c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
42a38392fc
报表元素接口
6 years ago
cb59664740
新增获取目录类型接口
...
新增查询关联角色接口
枚举名称调整
6 years ago
wei.peng
钮海涛
王杰
汪云昊
贾文涛
wynne1005
曾贞一
luweihao
jenkins
crish
jimmy.zeng
于学杰
jenkins
wei.peng
jiajack
Silliter
alwaysfrin