wei.peng
|
2e047d0978
|
微服务配置调整。
|
6 years ago |
 曾贞一
|
7dc84049c2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
wei.peng
|
adf4dec86d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
48ec96da9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
汪云昊
|
5fe0105c33
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wei.peng
|
09a4d94143
|
用户默认分页配置功能开发
用户获取首页插件Bug 修复
|
6 years ago |
|
wei.peng
|
66a68731c9
|
修复Bug 修改部门信息 组织信息不改变
|
6 years ago |
|
汪云昊
|
13403a35cc
|
周期修改关联数据
|
6 years ago |
crish
|
ba470d5ea2
|
获取core服务打印模板信息， 返回值添加具体泛型类型
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
crish
|
fdfe282e8b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
汪云昊
|
ce896c80d0
|
oracle ojdbc版本调整
|
6 years ago |
|
crish
|
570bf2ec14
|
条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
汪云昊
|
221eaa3e89
|
模板打印数据，加入白名单
|
6 years ago |
|
汪云昊
|
dc45feb6d7
|
模板打印数据，加入白名单
|
6 years ago |
|
汪云昊
|
08d2888087
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
|
6 years ago |
|
汪云昊
|
7ca830ae71
|
模板打印数据，加入白名单
|
6 years ago |
|
wei.peng
|
6f31a8849a
|
合并代码
|
6 years ago |
|
wei.peng
|
4461f9298e
|
获取模板详情列表功能接口开发完成
|
6 years ago |
|
wei.peng
|
910cd25d8f
|
异常国际化功能开发完成
|
6 years ago |
|
wei.peng
|
a7d2a584c2
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
crish
|
91d791960a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
wei.peng
|
a7f7b89365
|
获取模板 微服务调用重新编写
|
6 years ago |
|
crish
|
bb386b5032
|
权限测试
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
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 |