alwaysfrin
|
ab06c1e165
|
代码优化
|
7 years ago |
|
alwaysfrin
|
6ffcdc3c33
|
日志分析工具持久化，baserepository优化
|
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
|
cde6eb0ebb
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
bbe6b4f544
|
Base Repository 添加批量删除方法
|
7 years ago |
Silliter
|
bef9c86454
|
wms工厂仓库类书写
|
7 years ago |
|
wei.peng
|
1a3183addf
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
4d322c0d87
|
功能优化
|
7 years ago |
jimmy
|
b456f6c2f5
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
jimmy
|
54384429a7
|
增加交易状态枚举
|
7 years ago |
|
alwaysfrin
|
52d8fc86ad
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
Silliter
|
df8ad87dc4
|
wms工厂仓库类书写
|
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
|
830d481672
|
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
|
1750c725c6
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
4672bff2f8
|
Base Bean Bug 修改
关系表添加构造函数
|
7 years ago |
|
Administrator
|
f7e750e3cb
|
wms通用数据信息与字段实体增删改查
|
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 |
|
wei.peng
|
f824f73733
|
HQL 别名o 改为 model
|
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 |
|
wei.peng
|
44ea78b93a
|
添加批量删除
添加批量修改
|
7 years ago |
|
alwaysfrin
|
1d106c9e59
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
alwaysfrin
|
36f6c79e66
|
国家化处理
|
7 years ago |
|
yunhao.wang
|
e853dd63e4
|
count方法类型装换，long强转为int
|
7 years ago |
|
yunhao.wang
|
834d40d55e
|
硬件管理 完成
硬件类型管理 完成
|
7 years ago |
|
yunhao.wang
|
11c12f32c3
|
系统消息冗余字段调整
添加系统消息及硬件枚举信息
|
7 years ago |
|
yunhao.wang
|
bbc849b3d1
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
1c9295769c
|
添加枚举：
操作日志（操作类型，操作终端）
消息（消息状态，消息类型）
-硬件（连接方式，数据类型，状态）
系统参数（参数类型）
|
7 years ago |
|
wei.peng
|
a1bdbd827f
|
添加用户枚举
SQL BUG 修复
|
7 years ago |
|
wei.peng
|
5584ec7ce5
|
定时任务
定时任务表达式 功能完成
定时任务 功能完成
权限
用户管理 功能完成
用户登录 功能完成
|
7 years ago |