226 Commits (0aaa8112a864392b36e1f10a05c3ae7da0f786e8)

Author SHA1 Message Date
yunhao.wang c4b0e3ba0e 解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
6 years ago
wei.peng 9064b6528b 树形结构查列表完成 6 years ago
yunhao.wang 436f8ca139 解决bug 6 years ago
yunhao.wang 02e31b07c8 定时任务日志完成
解决bug
6 years ago
wei.peng b3d7cb259e 组织管理父节点Bug 修复
复杂查询添加默认排序
6 years ago
wei.peng 5241d27279 账号管理功能更新 6 years ago
yunhao.wang 4f828e8fab 定时任务重写 6 years ago
yunhao.wang 19e134074e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang ea621d14f8 定时任务修改 6 years ago
wei.peng bb9444fc91 用户登录信息封装 6 years ago
wei.peng 00715312f0 根据组织Id 集合、部门ID 集合 查询账号信息 6 years ago
wei.peng 0550adce28 用户管理更新 6 years ago
wei.peng 115183132d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 3750b11b88 用户管理更新 6 years ago
yunhao.wang 6b06d3ff04 bug解决
添加默认字典项
ics添加全局异常捕获
6 years ago
yunhao.wang af3cd73af4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 08d8281fd5 定时任务
dashboard
6 years ago
wei.peng 5a5ed82201 添加 Cloud 获取组织或者部门下面的人员信息功能完成 6 years ago
wei.peng 43bf2d2dba 菜单添加首字母缩写功能
部门管理 查询组织查询递归查询
6 years ago
wei.peng 18fa7b8e8e 用户菜单权限优化 6 years ago
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 0988c1ad26 用户登录优化 6 years ago
alwaysfrin 6118568fd5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 1d4ab876c1 添加自定义组件 6 years ago
yunhao.wang cb8d841aee 解决冲突 6 years ago
wei.peng ffb29d0d03 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng c221d618ea 登录日志功能完成 6 years ago
yunhao.wang bb289774d9 dashboard部分功能
修复bug
6 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