1534 Commits (c297ed45b7daedab2e2ce9cde9afcae1ec7c5498)
 

Author SHA1 Message Date
yunhao.wang d1bbff246a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
yunhao.wang b3149f21b4 定时任务
任务执行策略
7 years ago
wei.peng 3bce009cfc 账号管理功能优化 7 years ago
wei.peng 7087b4078e Merge remote-tracking branch 'origin/master' 7 years ago
wei.peng b3264ae909 用户信息拆分 合并代码处理 7 years ago
frin.fei 4bc8e7b369 Merge remote-tracking branch 'origin/master' 7 years ago
frin.fei fc53c7d454 微服调整 7 years ago
yunhao.wang a1d612a3cd 系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
7 years ago
wei.peng b97b2276e9 用户信息拆分 合并代码处理 7 years ago
wei.peng 9eeacc5286 用户信息拆分 合并代码处理 7 years ago
yunhao.wang 9d61f5a6a5 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
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 984d2dd7b3 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 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
alwaysfrin e26e8ac430 1,添加判断方法
2,切面中,补全新增和修改的用户基础信息
7 years ago
Silliter 2a6cd366b1 单元测试开发工具类新增 7 years ago
alwaysfrin 972b6bc064 base基类调整 7 years ago
alwaysfrin a9e6dc069f 代码调整优化 7 years ago
wei.peng 6f852cbd9f 添加修改密码功能
更新字段 Bug 修复
7 years ago
wei.peng ffad29d5b9 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
yunhao.wang 811225796e Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 7adb45b3bc 测试配置信息修改 7 years ago
Silliter 0a8c8a9252 wms工厂仓库类书写 7 years ago
alwaysfrin 3c97d315f7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java
7 years ago
alwaysfrin b82a9ec102 代码优化 7 years ago
wei.peng b03aa49948 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
Silliter 44bea05d62 wms工厂仓库类书写 7 years ago
wei.peng 0083c56363 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
alwaysfrin fa81fd3d16 代码优化调整 7 years ago
wei.peng 8dd831e890 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 382525b188 添加用户获取用户角色关系接口 7 years ago
alwaysfrin b6d8c8f54a Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
7 years ago
alwaysfrin c02b895cc6 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
alwaysfrin b147e319f7 日志分析工具持久化,baserepository优化 7 years ago
Silliter e5be5c9d73 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
Silliter c82331c346 wms工厂仓库类书写 7 years ago
alwaysfrin 50002af933 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java
7 years ago
alwaysfrin d7017351e7 日志分析工具 7 years ago
yunhao.wang c39dff1266 字典管理 批量删除
系统信息管理 get结果判断
硬件管理     批量修改状态
7 years ago
yunhao.wang 19714088d2 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 4b31fac721 用户管理
角色管理
功能管理
组织管理
部门管理
岗位管理
功能优化
7 years ago
wei.peng fcc72d46eb Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
yunhao.wang 16a773ee90 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
yunhao.wang 1b8178fe82 文件资源 批量删除
时间表达式 批量删除
定时任务 批量删除,启用,禁用
7 years ago
wei.peng 7cc85aab78 功能优化 7 years ago
alwaysfrin cfbe830662 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 5b5b07be3f 代码优化 7 years ago