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 |
|
wei.peng
|
f3dd7177c3
|
修改分页API 注释
|
7 years ago |
|
wei.peng
|
8d98aaf173
|
角色管理 功能完成
用户管理 功能完成
添加岗位代码唯一验证
添加部门代码唯一验证
添加组织代码唯一验证
添加角色代码唯一验证
|
7 years ago |
|
yunhao.wang
|
3ab42503d1
|
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/sqlpack/CoreHqlPack.java
定时任务 全部完成
|
7 years ago |
|
yunhao.wang
|
d590bd7591
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
5b69db3644
|
角色权限管理功能完成
|
7 years ago |
|
yunhao.wang
|
3da77d43e9
|
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/sqlpack/CoreHqlPack.java
消息管理 全部完成
文件管理 全部完成
任务表达式 全部完成
HqlPack 日期非空校验 调整
|
7 years ago |
|
alwaysfrin
|
16926429ec
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
fc5977d180
|
mongodb工具方法，日志部分使用mongo
|
7 years ago |
|
wei.peng
|
3af9e465ea
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
wei.peng
|
e82f083239
|
系统权限管理
系统角色管理
|
7 years ago |
|
yunhao.wang
|
8faf6218c7
|
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/sqlpack/CoreHqlPack.java
|
7 years ago |
|
alwaysfrin
|
e3fa15c69e
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
alwaysfrin
|
1a40cde203
|
mongodb整合，功能优化调整
|
7 years ago |
|
yunhao.wang
|
5285693eb1
|
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/sqlpack/CoreHqlPack.java
|
7 years ago |
|
yunhao.wang
|
4fc97d235b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
2f1163dd32
|
硬件类型 批量删除
硬件管理 分页，排序
字典 列表查询
|
7 years ago |
|
wei.peng
|
5da6fc4f75
|
岗位管理功能完成
组织管理功能完成
|
7 years ago |
|
yunhao.wang
|
2d870ae379
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core
|
7 years ago |
|
yunhao.wang
|
356f23fd18
|
单元测试
|
7 years ago |
|
yunhao.wang
|
b5d18b4847
|
系统参数管理 复杂查询，分页，排序
字典管理 复杂查询，分页，排序
硬件类型 复杂查询，分页，排序
分页插件 开始行错误bug
|
7 years ago |
|
wei.peng
|
21091dadab
|
添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
岗位功能模块 开发完成
|
7 years ago |
|
wei.peng
|
5ca5df9de6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
64b4ce2200
|
添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
岗位功能模块 开发完成
|
7 years ago |