wei.peng
|
87e15fcd13
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
alwaysfrin
|
0955b9ac13
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0098aba8c4
|
shiro会话id优化，自动update赋值优化
|
6 years ago |
|
wei.peng
|
b7bf845853
|
测试环境数据迁移 240
测试环境Redis 迁移 240
测试环境MQ 迁移 240
测试环境 APP 迁移 241
|
6 years ago |
yunhao.wang
|
10c6b8d011
|
字典添加所属模块
|
6 years ago |
|
yunhao.wang
|
06a995ab3e
|
定时任务优化
表单布局优化
|
6 years ago |
|
yunhao.wang
|
96b5fe90ef
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
73776f6c27
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
7f1f76eef2
|
结构优化调整，自动填充功能调整
|
6 years ago |
|
yunhao.wang
|
5e65210d18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
6bb5aebb66
|
字典添加默认代码查询接口
|
6 years ago |
Silliter
|
721f6f576b
|
优化打印模板
|
6 years ago |
|
Silliter
|
8f7349698d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
d656d82622
|
定时任务优化
|
6 years ago |
|
alwaysfrin
|
238cc817da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0a10d99845
|
eureka优化调整，exception优化
|
6 years ago |
|
wei.peng
|
10ee0ad5a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
cebc793b53
|
IP 配置修改
|
6 years ago |
|
yunhao.wang
|
05852898c3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
7c0c97ba61
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
f177a89d34
|
定时任务优化
|
6 years ago |
|
alwaysfrin
|
dbcaa33735
|
eureka优化调整，exception优化
|
6 years ago |
|
yunhao.wang
|
73a84c63a9
|
定时任务计划添加参数
|
6 years ago |
|
yunhao.wang
|
da76a0a512
|
自定义表单布局接口
自定义表单菜单接口
自定义表单功能接口
|
6 years ago |
|
yunhao.wang
|
ea0f5ce0f0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
5161c9cefa
|
表单报表部分功能
定时任务优化
|
6 years ago |
|
alwaysfrin
|
b824bf93a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Silliter
|
d3dd40bb86
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
a67bfdc11a
|
优化调整
|
6 years ago |
|
alwaysfrin
|
87a1666861
|
优化调整
|
6 years ago |
|
yunhao.wang
|
eee75ce2e4
|
jdbc
|
6 years ago |
|
yunhao.wang
|
002e863030
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
2d81c898d8
|
字典微服务调整
定时任务优化
自定义表单实体
|
6 years ago |
|
wei.peng
|
ace9524733
|
FindBugs 提示Bug 修改
|
6 years ago |
|
wei.peng
|
cf0bcf0a40
|
FindBugs 提示Bug 修改
|
6 years ago |
|
yunhao.wang
|
0e26184ff0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
76c234ced3
|
字典微服务调整
定时任务优化
|
6 years ago |
|
Silliter
|
17f9142c03
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
14e85f58a8
|
优化条码打印
|
6 years ago |
|
yunhao.wang
|
b2873e80ae
|
定时任务微服优化
|
6 years ago |
|
alwaysfrin
|
59599bae23
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
b1a6ea2581
|
添加mes、mes-pcn、sweb三个微服
|
6 years ago |
|
Silliter
|
e5b8641903
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
fd74559fd8
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yunhao.wang
|
e3454af8f6
|
字典树查询
单号规则计算优化
字典微服调用方法及调用案例
|
6 years ago |
|
Silliter
|
cdf0d91389
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
0b67e5b749
|
开发分页获取用户角色微服务接口
|
6 years ago |
|
Silliter
|
b853f785a4
|
条码打印开发，角色微服务提供
|
6 years ago |
|
Silliter
|
9a8c6b99de
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
d6f03ed876
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
Silliter
|
8408ba671c
|
开发条码打印后端
|
6 years ago |
|
wei.peng
|
9026617500
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-ics-gateway/src/main/resources/application-test.properties
# modules/i3plus-ics-regist/i3plus-ics-regist.iml
返回提示修改
报表打印修改
|
6 years ago |
|
yunhao.wang
|
45f7d05eab
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
ffb6a92e48
|
字典调整
|
6 years ago |
|
wei.peng
|
33de5b5291
|
默认地址修改
|
6 years ago |
|
alwaysfrin
|
8c42a886ee
|
定时任务调整
|
6 years ago |
|
alwaysfrin
|
f97eef9dfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
3457079a52
|
定时任务封装
|
6 years ago |
|
Silliter
|
76bacc59f0
|
开发打印模板功能
|
6 years ago |
|
alwaysfrin
|
bcf1f7f406
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
0a857b8857
|
schedule定时任务调整，fallback熔断机制改为factory模式
|
6 years ago |
|
yunhao.wang
|
98c7df4528
|
条码规则解析-特殊分隔符处理
|
6 years ago |
|
wei.peng
|
e573a52c57
|
注册中心更改
|
6 years ago |
|
yunhao.wang
|
11c970454d
|
测试配置调整
|
6 years ago |
|
yunhao.wang
|
89242cb04d
|
条码规则解析Demo
元素名称唯一校验
文件上传优化
|
6 years ago |
|
yunhao.wang
|
c5b16f1e99
|
统一提示信息为 操作成功
|
6 years ago |
|
yunhao.wang
|
b0af7e5de0
|
解决冲突
|
6 years ago |
|
yunhao.wang
|
a8f23b301b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
7b88c6cc33
|
条码规则管理
微服条码解析
|
6 years ago |
|
wei.peng
|
717a1b381a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
b60ed385ec
|
MQ 站内信 问题修复
|
6 years ago |
|
alwaysfrin
|
409ea33ea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
alwaysfrin
|
984ec34d2f
|
消息若发送失败后的处理
|
6 years ago |
|
wei.peng
|
dd8f5bd900
|
异常处理
|
6 years ago |
|
wei.peng
|
95fba8e7f7
|
数据库配置修改
|
6 years ago |
|
wei.peng
|
50c5227f55
|
Redis 配置更新
微服务配置更新
|
6 years ago |
|
wei.peng
|
bb411e1e98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
ec90f78120
|
自定义模板优化
echarts 工具新增
|
6 years ago |
|
wei.peng
|
22f8640eb2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
8474f4a569
|
添加批量删除任务计划功能
|
6 years ago |
|
yunhao.wang
|
37c2543354
|
报表优化，
邮件内容验证
|
6 years ago |
|
wei.peng
|
33eae84465
|
提示信息优化
|
6 years ago |
|
wei.peng
|
d0f6fdcd7a
|
3577 -> 优化错误提示
|
6 years ago |
|
wei.peng
|
2fc7e20497
|
自定义报表Bug 修复
|
6 years ago |
|
yunhao.wang
|
6f95765dd2
|
调试测试环境配置
|
6 years ago |
|
yunhao.wang
|
9f20dd7665
|
优化报表
单号生成规则调整重置条件
|
6 years ago |
|
yunhao.wang
|
8458d9f311
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
e7146eb5f5
|
wms定时任务job
|
6 years ago |
|
wei.peng
|
decde6020d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
ebc2befa65
|
自定义模板优化
echarts 工具新增
|
6 years ago |
|
yunhao.wang
|
03d3f53fed
|
报表优化
解决bug
邮件消息优化
|
6 years ago |
|
yunhao.wang
|
2ac8b3b8be
|
解决冲突
|
6 years ago |
|
yunhao.wang
|
6be635a392
|
报表优化
解决bug
|
6 years ago |
|
wei.peng
|
ed25f29058
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
199e1db555
|
自定义报表 功能优化
|
6 years ago |
|
yunhao.wang
|
b1db4a5b2f
|
报表优化
国际化接口
|
6 years ago |
|
yunhao.wang
|
dcfd377729
|
报表优化
|
6 years ago |
|
yunhao.wang
|
fa8622b3ee
|
解决冲突
|
6 years ago |
|
wei.peng
|
8b0a955f86
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
b734a90de7
|
测试案例提交
|
6 years ago |