wei.peng
|
97c339598b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
crish
|
a50e6d7e63
|
获取平台打印模板信息
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
wei.peng
|
fa1b652137
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
ae9457a667
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
42a159d023
|
IMPP 平台功能功能优化 . 软适适配功能开发
|
6 years ago |
|
crish
|
507cd718e4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
crish
|
0a61d16157
|
冲突解决
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
汪云昊
|
4d4b977f13
|
软件适配器-定时适配任务
|
6 years ago |
|
汪云昊
|
c73e81234f
|
job添加serialVersionUID
|
6 years ago |
|
汪云昊
|
fc8e880971
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
c1b6f31450
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
fb70966fbc
|
表单菜单排序
|
6 years ago |
|
汪云昊
|
39d675d18c
|
添加字典分组
|
6 years ago |
 曾贞一
|
184eea5d7a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
b1ebda5a22
|
日志输出补全
|
6 years ago |
|
wei.peng
|
bd8a35265f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
0aa3a70f10
|
平台权限系功能优化
|
6 years ago |
|
汪云昊
|
e2a2dd18d8
|
添加字典分组
优化redis资源键
|
6 years ago |
|
汪云昊
|
7b7439fda5
|
更新最后修改日期
|
6 years ago |
|
曾贞一
|
b8c6326a63
|
合并冲突
|
6 years ago |
|
曾贞一
|
c1aaf04b6c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
41d5a56953
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
46a47d5570
|
文件服务异常抛出
添加定时任务错过处理状态
|
6 years ago |
|
wei.peng
|
62a0622273
|
DEV 版本发布
|
6 years ago |
|
汪云昊
|
0aac9388be
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
44ae93782b
|
Redis Bean 名称优化
|
6 years ago |
|
曾贞一
|
e458f22bad
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
ccf3591686
|
定时任务去组织权限
|
6 years ago |
|
wei.peng
|
c10b7b0663
|
修改用户密码Bug修复
|
6 years ago |
|
wei.peng
|
c2cd2f9b07
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
5d528350ce
|
用户管理修改密码 Bug 修复
|
6 years ago |
|
汪云昊
|
8bc1adc3dc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
bb80706032
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
c279c46a84
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
0f8c88a939
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties
|
6 years ago |
|
wei.peng
|
c4fd04af06
|
数据库链接错误。
|
6 years ago |
于学杰
|
eea8c23503
|
1. 修改数据库连接
|
6 years ago |
|
wei.peng
|
6ab0a53fe8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
9381d57d26
|
1. 修改配置文件
|
6 years ago |
|
wei.peng
|
4ab6b5ef06
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
于学杰
|
6699347729
|
1. 增加 YFAS 宁德工厂的配置文件
|
6 years ago |
|
wei.peng
|
91e7774952
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
汪云昊
|
b9a3bbabaf
|
定时任务日志信息优化
|
6 years ago |
|
wei.peng
|
88894c8245
|
用户信息补漏
|
6 years ago |
|
wei.peng
|
12610a45e9
|
组织功能优化
|
6 years ago |
|
汪云昊
|
ef28b1476e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
545d46564c
|
功能优化
|
6 years ago |
|
汪云昊
|
d82a2d72d0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
b660f6c49b
|
组织集合查询接口
|
6 years ago |
|
wei.peng
|
1d6eb9cb2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |