1516 Commits (f066af390b9d878b0f11bad4c8e561cc55f3e66f)
 

Author SHA1 Message Date
wei.peng 470759395d 添加 Cloud 获取组织或者部门下面的人员信息功能完成 6 years ago
wei.peng 3c0f585eff 菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
6 years ago
wei.peng 0b6e3d0615 更新链接信息 6 years ago
wei.peng 5bad12a395 Merge branch 'dev' into test 6 years ago
wei.peng bdb1d04783 更新链接信息 6 years ago
wei.peng e16247a7fb 更新链接信息 6 years ago
wei.peng 03a64d6508 引用包错误解决 6 years ago
wei.peng 951b65e289 用户菜单权限优化 6 years ago
wei.peng 9ed732ca0e 用户登录权限优化 6 years ago
wei.peng 3eca86cf18 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 2eab7837a5 bug解决 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
yunhao.wang 9aaa7f4f43 dev配置 6 years ago
yunhao.wang c6e88bf0e6 还原 6 years ago
yunhao.wang a9ca8ea45b dev配置文件调整 6 years ago
alwaysfrin 815930bd83 处理文件路径 6 years ago
alwaysfrin c6f6e99635 调整software序号 6 years ago
alwaysfrin 38c0df1611 添加自定义组件 6 years ago
wei.peng 9bba86fab8 数据不存在的时候返回失败 6 years ago
wei.peng dee9ce7bb0 添加 isChecked 6 years ago
wei.peng cdb6eb290b 用户登录记录功能完成 6 years ago
wei.peng 6e0347a873 用户登录记录功能完成 6 years ago
yunhao.wang 5bc9b93bd5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
yunhao.wang 10cc6b0b1d dashboard部分功能
修复bug
6 years ago
alwaysfrin e1fedeb9a5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev 6 years ago
alwaysfrin a9320298b7 扩展块功能 6 years ago
alwaysfrin 518799fb8c 优化 6 years ago
wei.peng 239569aa18 Merge branch 'dev' into test 6 years ago
wei.peng e77af7ef7b 添加SID 返回信息 6 years ago
wei.peng 4123856456 Merge branch 'dev' into test 6 years ago
yunhao.wang cacb6b7e75 解决冲突 6 years ago
yunhao.wang 0f4b6a9ee9 解决冲突 6 years ago
yunhao.wang 69d5a7424d 解决冲突 6 years ago
wei.peng 0074735a07 Merge branch 'dev' into test 6 years ago
wei.peng d773297f78 userInfo.setOrganizeCode(organize.getOrganizeCode()); 6 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
6 years ago
wei.peng 0bb901bdfc 合并代码 解决冲突 6 years ago
wei.peng aaa52613ce 日志输出格式优化 6 years ago
yunhao.wang 219f1dde42 解决冲突 6 years ago
yunhao.wang 9829dc9381 解决bug 6 years ago
wei.peng 887e176ba7 日志输出优化
统计账号数量优化
6 years ago
wei.peng 6ecf276183 添加 ApiOperation 6 years ago
wei.peng 0f414fcaeb Junit Test 用户登录问题修复 6 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
yunhao.wang 933ff3543b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test 7 years ago