 钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
5 years ago |
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
5 years ago |
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
5 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
5 years ago |
|
汪云昊
|
f09159dffa
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
1051b22575
|
ICS 注册中心监控对象
|
5 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
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 |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
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 |
|
peter.pan
|
543171dfbb
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
1ac5542541
|
动态表单分页功能完成
|
6 years ago |
|
peter.pan
|
c436c8ee3d
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
peter.pan
|
d39c16c5d5
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
1ee9cb24f2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
299c0c5bee
|
DataObject Key 动态获取
|
6 years ago |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jenkins
|
511df468ec
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
wei.peng
|
13af329513
|
动态查询Cloud 服务基础功能已完成 1.0
|
6 years ago |
|
wei.peng
|
9c201c70e8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
8c4d74db52
|
解决冲突
细节优化
自定义表单功能管理 添加 是否设计字段
|
6 years ago |
|
jenkins
|
a58888df85
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
c4dceace92
|
增加动态报表对外接口-批量修改
|
6 years ago |
|
jenkins
|
878108e86f
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
3630f0c2f1
|
动态查询Cloud 服务基础功能已完成
|
6 years ago |
|
jenkins
|
1a7cda72d3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
27e4fc8ec2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
aec4b9a85a
|
自定义表单 多数据源 功能完成
|
6 years ago |
|
汪云昊
|
e2cfcc4c5f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
e514479f00
|
细节优化
|
6 years ago |
allen.zhang
|
67e3851a86
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
4cbc41a959
|
细节优化
|
6 years ago |
|
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
bf3c1898fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
4c8c550ba1
|
自定报表自定义表单打通
|
6 years ago |
|
汪云昊
|
9b51768cb2
|
表单布局解决行列数量不准确
|
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
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
7e8730ea9f
|
自定义按钮功能接口
消息优化
|
6 years ago |
|
jenkins
|
850b372ab4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
0aaa8112a8
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
wei.peng
|
d1ac366574
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
Silliter
|
83ce4f0efb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
c119c06130
|
自定义表单 使用Redis 1.0 功能完成
|
6 years ago |
|
Silliter
|
0c12793473
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
3d3260c1a7
|
表单菜单权限接口
|
6 years ago |
|
Silliter
|
28e43c087b
|
合并dev分支代码
|
6 years ago |
|
wei.peng
|
97e992f05f
|
自定义表单拦截器开发1.1完成
优化动态表单页面接口
|
6 years ago |
|
yunhao.wang
|
3a704f8542
|
添加冗余字段
|
6 years ago |
|
Silliter
|
6cb456fcc4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
1e22ff7e75
|
表单-拦截器添加状态
|
6 years ago |
|
Silliter
|
65b388d048
|
合并dev分支代码
|
6 years ago |
|
wei.peng
|
120ea87da8
|
动态接口集成 Bug修复
|
6 years ago |
|
yunhao.wang
|
9c54bc6f9d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
8402877d9a
|
表单功能接口
|
6 years ago |
|
Silliter
|
df714efc3b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
c2079ed03b
|
系统菜单查询接口
|
6 years ago |
|
yunhao.wang
|
e18d115d3a
|
系统菜单查询接口
|
6 years ago |
|
wei.peng
|
15901e3fe1
|
自定义表单拦截器开发1.0完成
|
6 years ago |
|
Silliter
|
d885d6b877
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
cbfc1b470e
|
平台-用户操作组织修改接口
表单-拦截器添加执行顺序
表单-功能明细前后端联调
|
6 years ago |
|
Silliter
|
451b70acad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
bb510e573d
|
表单布局-删除行列校验 必须保留1行1列
|
6 years ago |
|
yunhao.wang
|
0da89fa17e
|
表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
|
6 years ago |
|
Silliter
|
4c0116b082
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
6d8643da0c
|
权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
|
6 years ago |
|
yunhao.wang
|
1d9dd174e9
|
前端联调接口优化
单号生成工具类bug解决
|
6 years ago |
|
wei.peng
|
82d472466b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
wei.peng
|
f810e35873
|
自定义表单 数据操作接口 DAO 层优化
|
6 years ago |
|
Silliter
|
c90dca9b05
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
9d047fa3e5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1adc8e4baf
|
自定义表单 数据操作接口 DAO 层完成
|
6 years ago |
|
Silliter
|
d25902b294
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
f6ed505fc4
|
细节优化
bug修复
|
6 years ago |
|
Silliter
|
7e0f4b031f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
ea31519fdc
|
表单功能接口优化
文件微服接口优化
自动填充单元测试
|
6 years ago |
|
wei.peng
|
74e89fa54e
|
元素增删改查 DAO层接口完成
|
6 years ago |
|
Silliter
|
e61669dd98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
54f974ae89
|
微服文件管理接口
|
6 years ago |
|
Silliter
|
92c5457521
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
d59318a024
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
ccce8c009c
|
级联功能接口完成
|
6 years ago |
|
yunhao.wang
|
cb6b06cb6a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
865add1f7f
|
按钮功能接口
|
6 years ago |
|
Silliter
|
e8deda24fe
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b562d94c0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1e797d0dac
|
级联功能接口完成(未测试)
|
6 years ago |
|
yunhao.wang
|
9beafd1bc6
|
自定义表单 功能权限管理接口
微服调整 平台角色获取方法调整
|
6 years ago |
|
Silliter
|
fe644066af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
d3331e4e12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
04ed151d45
|
元素管理接口完成(未测试)
|
6 years ago |
|
yunhao.wang
|
dc9fbb2919
|
添加拦截器接口
|
6 years ago |
|
wei.peng
|
93f4745afd
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# pom.xml
|
6 years ago |
|
yunhao.wang
|
6efb49aca5
|
表单功能接口优化
表单布局接口优化
表单菜单接口优化
|
6 years ago |
|
wei.peng
|
7190c8ff6f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |