wei.peng
|
f9f0a5714b
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
67e4ee2457
|
用户账号数量功能提交
|
7 years ago |
|
wei.peng
|
a99527f52e
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
e9b01fe54e
|
remove .idea
|
7 years ago |
|
wei.peng
|
ba940403fa
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
0a1c9649b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
wei.peng
|
453caba58a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
wei.peng
|
bfd3809daf
|
用户功能优化
|
7 years ago |
alwaysfrin
|
8938b70866
|
调整
|
7 years ago |
|
alwaysfrin
|
8d8203aafc
|
结构错误
|
7 years ago |
|
alwaysfrin
|
4fac35c583
|
结构错误
|
7 years ago |
|
alwaysfrin
|
6f276de76f
|
结构错误
|
7 years ago |
|
wei.peng
|
b382c5ae00
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
# modules/i3plus-core-api/pom.xml
# modules/i3plus-core-apiservice/pom.xml
# modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
# modules/i3plus-core-apiservice/src/main/resources/application-test.properties
# pom.xml
|
7 years ago |
|
wei.peng
|
fcc97cb438
|
发布 正式版本 1.0
|
7 years ago |
yunhao.wang
|
74c78570ed
|
项目pom版本更新为dev
|
7 years ago |
|
yunhao.wang
|
7a0657665e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
a57c4ee19e
|
Excel导入导出
|
7 years ago |
|
wei.peng
|
402bca0a8c
|
代码优化
|
7 years ago |
|
wei.peng
|
6a521dee37
|
异常处理优化
|
7 years ago |
|
wei.peng
|
9bf2152762
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
28b17c83a6
|
功能代码优化
|
7 years ago |
|
yunhao.wang
|
5b154b40df
|
字典管理优化
|
7 years ago |
|
yunhao.wang
|
3840dea649
|
功能细节调整
|
7 years ago |
|
yunhao.wang
|
b5fcc65f99
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java
|
7 years ago |
|
yunhao.wang
|
da1c50f9a0
|
用户消息
websocket
|
7 years ago |
|
yunhao.wang
|
c9ef53ef80
|
定时任务
单号生成规则
|
7 years ago |
|
wei.peng
|
53b0b86130
|
功能代码优化
|
7 years ago |
|
wei.peng
|
22f9126b2c
|
自动填充信息Bug 修复
|
7 years ago |
|
yunhao.wang
|
0c69ad329c
|
消息管理封装
|
7 years ago |
|
yunhao.wang
|
e1f7b6dea0
|
消息队列调整
系统参数管理
数据初始化文件
|
7 years ago |
|
yunhao.wang
|
e093c5c6d7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
42aaa4ba29
|
单号生成规则
邮件配置信息来源改为系统配置信息
|
7 years ago |
|
wei.peng
|
267152a2ad
|
1、复杂树 功能完成
|
7 years ago |
|
yunhao.wang
|
b7500c7324
|
系统资源 批量添加
|
7 years ago |
|
yunhao.wang
|
962b18ba1b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework
# Conflicts:
# modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
|
7 years ago |
|
wei.peng
|
350fcb59dd
|
1、更新字段名,更新对象名称
|
7 years ago |
|
wei.peng
|
23a6a8a99a
|
代码优化
|
7 years ago |
|
yunhao.wang
|
3a8be23b6f
|
站内信 全部完成
|
7 years ago |
|
yunhao.wang
|
c2e1417ce1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
d944fd77c1
|
文件丢失撤回
|
7 years ago |
|
wei.peng
|
87d694abb6
|
文件丢失找回
|
7 years ago |
Silliter
|
9d111dfd59
|
单元测试开发工具类新增
|
7 years ago |
|
wei.peng
|
04ba139eb6
|
用户登录功能完成
|
7 years ago |
|
wei.peng
|
3bce009cfc
|
账号管理功能优化
|
7 years ago |
|
yunhao.wang
|
a1d612a3cd
|
系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
|
7 years ago |
|
wei.peng
|
b69ce2e2e6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
925c10da8b
|
用户信息拆分
|
7 years ago |
|
yunhao.wang
|
0fa2a4c605
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
# Conflicts:
# modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
|
7 years ago |
|
yunhao.wang
|
ae0e8392ac
|
系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
|
7 years ago |
|
alwaysfrin
|
43770f8bcc
|
1，对象hashcode和equals继承父对象
2，主键生成策略优化
|
7 years ago |