wei.peng
|
d1f39edac4
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
|
6 years ago |
yunhao.wang
|
005c30c761
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
6 years ago |
|
yunhao.wang
|
e25703f3de
|
定时任务
dashboard
|
6 years ago |
|
wei.peng
|
470759395d
|
添加 Cloud 获取组织或者部门下面的人员信息功能完成
|
6 years ago |
|
wei.peng
|
3c0f585eff
|
菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
|
6 years ago |
|
wei.peng
|
5bad12a395
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
951b65e289
|
用户菜单权限优化
|
6 years ago |
|
yunhao.wang
|
e786d0e7cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
6 years ago |
|
yunhao.wang
|
73985b0437
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDashboardService.java
|
6 years ago |
|
yunhao.wang
|
db337bc2a8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
8e6883b2df
|
bug解决
|
6 years ago |
alwaysfrin
|
815930bd83
|
处理文件路径
|
6 years ago |
|
alwaysfrin
|
c6f6e99635
|
调整software序号
|
6 years ago |
|
alwaysfrin
|
38c0df1611
|
添加自定义组件
|
6 years ago |
|
wei.peng
|
cdb6eb290b
|
用户登录记录功能完成
|
7 years ago |
|
wei.peng
|
6e0347a873
|
用户登录记录功能完成
|
7 years ago |
|
yunhao.wang
|
10cc6b0b1d
|
dashboard部分功能
修复bug
|
7 years ago |
|
wei.peng
|
6baed9bafa
|
Merge branch 'dev' into test
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
|
7 years ago |
|
wei.peng
|
0bb901bdfc
|
合并代码 解决冲突
|
7 years ago |
|
wei.peng
|
aaa52613ce
|
日志输出格式优化
|
7 years ago |
|
yunhao.wang
|
219f1dde42
|
解决冲突
|
7 years ago |
|
yunhao.wang
|
9829dc9381
|
解决bug
|
7 years ago |
|
wei.peng
|
6ecf276183
|
添加 ApiOperation
|
7 years ago |
|
wei.peng
|
0f414fcaeb
|
Junit Test 用户登录问题修复
|
7 years ago |
|
yunhao.wang
|
2c1088a431
|
微服务状态提醒
及部分dashboard
|
7 years ago |
|
alwaysfrin
|
48cfb1fa88
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
alwaysfrin
|
18dc8d980d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
# Conflicts:
# modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java
|
7 years ago |
|
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 |