wei.peng
|
0988c1ad26
|
用户登录优化
|
7 years ago |
alwaysfrin
|
6118568fd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
1d4ab876c1
|
添加自定义组件
|
7 years ago |
yunhao.wang
|
cb8d841aee
|
解决冲突
|
7 years ago |
|
wei.peng
|
ffb29d0d03
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
c221d618ea
|
登录日志功能完成
|
7 years ago |
|
yunhao.wang
|
bb289774d9
|
dashboard部分功能
修复bug
|
7 years ago |
|
yunhao.wang
|
c6399fb209
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
4fe87c5ce2
|
解决bug
|
7 years ago |
gragon.xu
|
f43d392209
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
46dc170d4c
|
单元测试：流程管家逻辑处理方法入参修改
|
7 years ago |
|
wei.peng
|
22c9a7cc20
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
0d6963f36c
|
分支测试
|
7 years ago |
|
wei.peng
|
786c652900
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
95a58d97a2
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
bd3ab06440
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
35ecf85881
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
47dd4c68b5
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
2ad41030e6
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
42b8443073
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
cab08786f3
|
用户功能优化
|
7 years ago |
|
wei.peng
|
06927ff370
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
wei.peng
|
7ba903a430
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-wms into test
# Conflicts:
# modules/i3plus-wms-api/pom.xml
# modules/i3plus-wms-apiservice/pom.xml
# pom.xml
|
7 years ago |
|
yunhao.wang
|
8e25a0c437
|
单号规则管理excel导入导出
|
7 years ago |
|
wei.peng
|
9eb7122e99
|
发布 正式版本 1.0
|
7 years ago |
|
wei.peng
|
e0f3118296
|
发布 正式版本 1.0
|
7 years ago |
|
yunhao.wang
|
cb95d0a713
|
项目pom版本更新为test
|
7 years ago |
|
yunhao.wang
|
236dbc4f66
|
项目pom版本更新为dev
|
7 years ago |
|
yunhao.wang
|
680c22e1f1
|
Excel导入导出
|
7 years ago |
|
yunhao.wang
|
7c37ce05a7
|
transient 替换为 @Transien
|
7 years ago |
|
yunhao.wang
|
838f500156
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
|
7 years ago |
|
yunhao.wang
|
d7b4b1f7ab
|
transient 替换为 @Transien
|
7 years ago |
|
wei.peng
|
54d5d84a6b
|
用户管理优化
|
7 years ago |
|
wei.peng
|
d039586e05
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
wei.peng
|
7f5470c34a
|
查询优化
|
7 years ago |
|
yunhao.wang
|
0aac978b99
|
字典管理优化
|
7 years ago |
|
wei.peng
|
2753f64b7e
|
功能代码优化
|
7 years ago |
|
wei.peng
|
804008410e
|
功能代码优化
|
7 years ago |
|
yunhao.wang
|
571b3043ac
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yunhao.wang
|
6cab7b9d09
|
用户消息
websocket
|
7 years ago |
|
yunhao.wang
|
e0eb81177d
|
定时任务
单号生成规则
|
7 years ago |
|
wei.peng
|
4e995eac9b
|
功能代码优化
|
7 years ago |
|
wei.peng
|
5dbf1bb2e8
|
自动填充信息Bug 修复
|
7 years ago |
|
wei.peng
|
ada91e5947
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
4229601ddb
|
消息管理封装
|
7 years ago |
|
wei.peng
|
605a438afc
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
0400daa0f8
|
消息队列调整
系统参数管理
数据初始化文件
|
7 years ago |
|
wei.peng
|
372d916d0f
|
异常处理优化
|
7 years ago |
|
yunhao.wang
|
c25fa2563d
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
9ee31a5113
|
单号生成规则
邮件配置信息来源改为系统配置信息
|
7 years ago |
|
wei.peng
|
855d9abef8
|
1、复杂树 功能完成
|
7 years ago |
|
wei.peng
|
9a94061e5b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
wei.peng
|
539afe3243
|
1、用户信息结构调整
|
7 years ago |
|
yunhao.wang
|
f0cb40891f
|
系统资源 批量添加
|
7 years ago |
|
yunhao.wang
|
4421ab69ef
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/impp-framework
# Conflicts:
# modules/impp-framework-boot/src/main/java/cn/estsh/impp/framework/boot/aspect/LogServiceAspect.java
|
7 years ago |
|
yunhao.wang
|
963c01c93b
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
80d6c1a4aa
|
操作日志添加属性
|
7 years ago |
|
wei.peng
|
ef85c84e68
|
1、BaseRepositoryImpl 根据ID 查询Bug 修复
2、更新字段名,更新对象名称
|
7 years ago |
|
wei.peng
|
dec260e3ca
|
代码优化
|
7 years ago |
|
yunhao.wang
|
c92dede629
|
邮件消息队列调整
|
7 years ago |
|
yunhao.wang
|
1b76c95b7a
|
站内信 全部完成
|
7 years ago |
|
yunhao.wang
|
f8e6e35009
|
Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
7 years ago |
|
yunhao.wang
|
47901856d2
|
消息变更
|
7 years ago |
|
wei.peng
|
19e107984e
|
动态功能权限 功能完成
|
7 years ago |
frin.fei
|
d4f6f639d5
|
eureka、feign整合
|
7 years ago |
|
frin.fei
|
f07489d04d
|
eureka、feign整合
|
7 years ago |
|
yunhao.wang
|
4fb5f548cf
|
定时任务 完成
表达式 完成
邮件工具类
|
7 years ago |
|
wei.peng
|
fb2de0496d
|
用户图像功能完成
|
7 years ago |
|
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 |