228 Commits (8871725802915d422d048d7d7a9b3ff715ede258)

Author SHA1 Message Date
汪云昊 8871725802 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 cbe588449e 平台字典优化
websocket
6 years ago
wei.peng dec6086c96 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 3526f9e0b6 工厂数量控制
用户数量控制
6 years ago
汪云昊 4a4049c44e 单号获取微服务调用调整 6 years ago
alwaysfrin 6b1620772b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin d54ab69ee5 事务和redis的bug处理 6 years ago
wei.peng 3d110244d7 功能目录导入导出 6 years ago
allen.zhang c69d52364f Merge branch 'dev' into test 6 years ago
汪云昊 18e0d0d60a 读写分离 6 years ago
allen.zhang 2c15ede4f0 Merge branch 'dev' into test 6 years ago
汪云昊 3a083c00c7 读写分离 6 years ago
汪云昊 18b04a720e 长文本数据调整 6 years ago
Silliter 7af35bd641 Merge branch 'dev' into test 6 years ago
alwaysfrin 3fb4018626 事务调整及demo 6 years ago
wei.peng dfa66046f2 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 6 years ago
wei.peng 6eee60bccd 添加注释 6 years ago
wei.peng 9d7d9a77bc 添加注释 6 years ago
jenkins 88c3c6b685 Merge remote-tracking branch 'origin/dev' into test 6 years ago
alwaysfrin 1bdc2cf3f8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin a6301d2d8c 事务持久化调整 6 years ago
yunhao.wang 82b8371747 自定义按钮功能接口
消息优化
6 years ago
Silliter 5812b5b7b5 合并dev分支代码 6 years ago
yunhao.wang 609c302699 添加用户消息删除接口
添加系统消息微服调用方法
6 years ago
Silliter 57b276e6e0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 50f69d91e0 定时任务微服调用方法 6 years ago
yunhao.wang 034e3b77a1 Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-core-api/i3plus-core-api.iml
#	modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
6 years ago
Silliter cb36356667 优化打印模板,开发禁用启用接口 6 years ago
yunhao.wang afaf6c8f58 消息附件管理 6 years ago
jiajack 52a826058c 删除iml文件 6 years ago
yunhao.wang cc0e350e73 bug修复 6 years ago
yunhao.wang 733d41578c 表单功能接口优化
文件微服接口优化
自动填充单元测试
6 years ago
Silliter 89b7bf03df 合并代码 6 years ago
yunhao.wang 4d96152b3e 微服文件管理接口 6 years ago
alwaysfrin 385b321791 hql封装优化 6 years ago
yunhao.wang d63d31eb11 Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application.properties
6 years ago
alwaysfrin fa6d248ea0 hql封装优化 6 years ago
wei.peng 10ee0ad5a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter d3dd40bb86 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
alwaysfrin 87a1666861 优化调整 6 years ago
yunhao.wang 2d81c898d8 字典微服务调整
定时任务优化
自定义表单实体
6 years ago
yunhao.wang b2873e80ae 定时任务微服优化 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
Silliter 76bacc59f0 开发打印模板功能 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 b60ed385ec MQ 站内信 问题修复 6 years ago
wei.peng bb411e1e98 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago