yunhao.wang
|
4f246cb310
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
5231aa7a6c
|
定时任务
任务执行策略
|
7 years ago |
wei.peng
|
30683429a9
|
添加账号查询条件
|
7 years ago |
|
wei.peng
|
2e8e2895c7
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
f8579cdfc6
|
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
|
98d60b8443
|
用户信息拆分 合并代码处理
|
7 years ago |
|
wei.peng
|
6991ab1599
|
用户信息拆分
|
7 years ago |
|
yunhao.wang
|
0868238a6d
|
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/bean/LogSystem.java
|
7 years ago |
|
yunhao.wang
|
03ddda82d1
|
系统日志 全部完成
操作日志 全部完成
系统语言 全部完成
|
7 years ago |
alwaysfrin
|
dad173dfd0
|
1，对象hashcode和equals继承父对象
2，主键生成策略优化
|
7 years ago |
|
alwaysfrin
|
f8e8217389
|
代码调整优化
|
7 years ago |
|
alwaysfrin
|
a34c1e9f63
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
|
7 years ago |
|
alwaysfrin
|
6ffcdc3c33
|
日志分析工具持久化，baserepository优化
|
7 years ago |
Silliter
|
ea3518db8a
|
wms工厂仓库类书写
|
7 years ago |
|
Silliter
|
1dba722a42
|
wms工厂仓库类书写
|
7 years ago |
|
wei.peng
|
30d2452a8d
|
放开注释
|
7 years ago |
|
alwaysfrin
|
4e343b504b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
alwaysfrin
|
9f903fa40c
|
日志分析工具
|
7 years ago |
amy
|
9b4ac2b7bf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
amy
|
11dcd6be3a
|
仓库
|
7 years ago |
|
yunhao.wang
|
bd0c104431
|
字典管理 批量删除
系统信息管理 get结果判断
硬件管理 批量修改状态
|
7 years ago |
|
wei.peng
|
bbe6b4f544
|
Base Repository 添加批量删除方法
|
7 years ago |
|
alwaysfrin
|
52d8fc86ad
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
6d71ac7f5e
|
解决冲突
|
7 years ago |
|
wei.peng
|
a0315d85ac
|
枚举添加注解
POJO 注解顺序调整
添加用户复杂查询
|
7 years ago |
|
yunhao.wang
|
02c9b473e4
|
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
|
3cfcb84f50
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
2c6ec19b54
|
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 |
|
wei.peng
|
4672bff2f8
|
Base Bean Bug 修改
关系表添加构造函数
|
7 years ago |
|
alwaysfrin
|
dc0c0b0058
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
d7b7501d19
|
mongodb工具方法，日志部分使用mongo
|
7 years ago |
|
wei.peng
|
f969257dea
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
978bb1e8be
|
异常信息 添加 USER_LOGIN_NAME_EXCEPTION
|
7 years ago |
|
yunhao.wang
|
63eee71bb0
|
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
|
9ea6567876
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
3b0d13dca2
|
mongodb整合，功能优化调整
|
7 years ago |
|
yunhao.wang
|
c055bae070
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
c23c091e86
|
硬件类型 批量删除
硬件管理 分页，排序
字典 列表查询
|
7 years ago |
|
wei.peng
|
9bac06edae
|
组织管理功能完成
|
7 years ago |
|
yunhao.wang
|
406ada5ac1
|
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
|
888966732b
|
系统参数管理 复杂查询，分页，排序
字典管理 复杂查询，分页，排序
硬件类型 复杂查询，分页，排序
分页插件 开始行错误bug
|
7 years ago |
|
wei.peng
|
4061d60660
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
ffb0d1fd83
|
添加 岗位Tree
添加 部门Tree
添加 组织Tree
添加 功能Tree
|
7 years ago |
|
yunhao.wang
|
8dbcbd17be
|
枚举字段整理
|
7 years ago |
|
wei.peng
|
68b4778fd3
|
POJO 更新
|
7 years ago |
|
wei.peng
|
06d7cf1c9f
|
用户权限 更新
|
7 years ago |
|
yunhao.wang
|
9afe46a6b7
|
规范实体字段
|
7 years ago |
|
alwaysfrin
|
75870afd36
|
跨域提交
mq发送邮件
|
7 years ago |
|
yunhao.wang
|
834d40d55e
|
硬件管理 完成
硬件类型管理 完成
|
7 years ago |
|
yunhao.wang
|
11c12f32c3
|
系统消息冗余字段调整
添加系统消息及硬件枚举信息
|
7 years ago |