I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,003 Commits
1 Branch
0 Tags
20 MiB
Commit Graph

384 Commits (99b66e459d339508db96da6a125b311fe62fc6bc)

Author SHA1 Message Date
allen.zhang e24e7ef421 Merge branch 'dev' into test
wei.peng 7831940c2a FastDfs 添加日志
汪云昊 68c8c62542 Merge remote-tracking branch 'remotes/origin/dev' into test
汪云昊 93ace83b5f 长文本数据类型
wei.peng 302ac8a7e8 初始化功能目录
allen.zhang 440083b5f2 Merge branch 'dev' into test
alwaysfrin d00c228823 事务调整及demo
jenkins a7833ea9dd Merge remote-tracking branch 'origin/dev' into test
alwaysfrin 7edd35e688 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng aafa463afc 添加英文的时候字段长度不够，修改字段类型
alwaysfrin a1ccd25594 事务调整及demo
yunhao.wang 58247fe3f1 清除iml
wei.peng f5307b5ab3 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wei.peng 7349c5fb3a 添加注释
jenkins 92e2b7fd84 Merge remote-tracking branch 'origin/dev' into test
yunhao.wang 85178af7f9 消息细节调整
jenkins 4a5d0f0cb3 Merge remote-tracking branch 'origin/dev' into test
yunhao.wang 7f8217e644 清除测试类
Silliter 3d56e2539d 合并dev代码
yunhao.wang eee0539562 sweb公告处理
Silliter 0c12793473 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 3d3260c1a7 表单菜单权限接口
Silliter 0f7695eab3 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 85210d4ca1 优化流程管家
Silliter 451b70acad Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 0da89fa17e 表单-布局新增行列设置初始数据 
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
Silliter 4b440fc1f3 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang bd050ae3ac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 5a4c85e409 消息附件管理
Silliter 0fe1e95789 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 5ec2caf56d 优化查询封装实体
Silliter 4c0116b082 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 6d8643da0c 权限分配调整接口 
消息调整添加微服务支持
添加sweb通知处理队列
Silliter a4bc8ec6ca Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 5acf1ac8f5 Merge branches 'dev' and 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter eedfaf7392 优化流程管家
crish 4dd872698b 流程管家：解决所有流程都走收获问题
Silliter 7e3c43610f Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter 7b276e709b 流程日志明细查询优化
Silliter 72e7759c8f 修改流程日志查询
Silliter 76c5330a16 流程日志新增实体
Silliter 5a1a84f10f 流程管家新增日志bug修改
Silliter ba3a542934 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Silliter 8684d95c1e 优化代码
jiajack 3a5f43f97b 删除iml文件
Silliter d25902b294 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang f6ed505fc4 细节优化 
bug修复
Silliter 9c7665d354 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 2830bd0376 hql封装优化
Silliter e61669dd98 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 54f974ae89 微服文件管理接口
wei.peng 93f4745afd Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 
# Conflicts:
#	pom.xml
yunhao.wang 513fa332c8 测试
alwaysfrin 8fb36134a6 shiro会话id优化，自动update赋值优化
Silliter dbeb965e9b Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang fc44c4919f 定时任务计划添加参数
Silliter 111c6177c9 Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin ea2eb6103d 优化调整
Silliter dd0af51d8f Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 2ba8b1498b 字典微服务调整 
定时任务优化
自定义表单实体
yunhao.wang 5f746792c5 字典微服务调整 
定时任务优化
yunhao.wang 498fbea67b 定时任务微服优化
Silliter 618ce5d560 Merge remote-tracking branch 'remotes/origin/dev' into test
Silliter c4ef1e66f3 开发条码打印后端
wei.peng 8ec8dba414 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 9f41b29d95 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 4055e6fa76 字典调整
alwaysfrin 7e9704db00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin fd6552b4ac 定时任务封装
Silliter 05efe333cc 开发打印模板功能
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 307f07e7ed 条码规则管理 
微服条码解析
wei.peng 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 2943bfcf9f 添加批量删除任务计划功能
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 8e029e82e0 报表优化 
解决bug
邮件消息优化
yunhao.wang 4154b60249 报表优化 
解决bug
yunhao.wang adfe3cb2e6 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang ba36cfecd5 报表优化 
国际化接口
yunhao.wang dedc7b45fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang b01e479cb3 报表优化 
impp压测接口优化
消息队列非空验证
单号管理增加状态
wei.peng 3fce943723 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng d9d38bd991 自定义报表 获取目录接口功能完成
yunhao.wang 02f95f0939 性能测试
yunhao.wang a68771db32 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 23450c0218 bug解决 
操作日志添加人员登录名称
yunhao.wang fef135791c 定时任务异常通知 
网关返回信息类型改为 BaseResultBean
添加队列监听开关
alwaysfrin 16daf7c1b9 修改了
wei.peng a2bbd4b5f0 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 19a8189b05 模板管理 后台功能完成
wei.peng 2bd16137bd 模板管理 后台功能完成
yunhao.wang d0cee703fe 测试邮件发送
yunhao.wang 7d4f3ebb67 Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 77296816e6 通用导出 
单号规则导入导出
系统参数添加组
yunhao.wang c4b0e3ba0e 解决bug 
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
wei.peng ff0cdb8abb Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 9064b6528b 树形结构查列表完成
Silliter 65fead254f Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 436f8ca139 解决bug
Silliter 180c8c230c Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 02e31b07c8 定时任务日志完成 
解决bug
wei.peng 8a8f3dbb57 Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng b3d7cb259e 组织管理父节点Bug 修复 
复杂查询添加默认排序
wei.peng e01d83adca Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 5241d27279 账号管理功能更新
wei.peng 3f6b281912 发版 2018年12月28日
yunhao.wang 4f828e8fab 定时任务重写
Silliter a4d59caaeb Merge remote-tracking branch 'remotes/origin/dev' into test
yunhao.wang 19e134074e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang ea621d14f8 定时任务修改
wei.peng bb9444fc91 用户登录信息封装
wei.peng 00715312f0 根据组织Id 集合、部门ID 集合 查询账号信息
wei.peng 0550adce28 用户管理更新
Silliter 8fa14247f5 解决冲突
Silliter cc3bb9e9ae Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 115183132d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng 3750b11b88 用户管理更新
yunhao.wang 6b06d3ff04 bug解决 
添加默认字典项
ics添加全局异常捕获
wei.peng 38be37aad0 Merge branch 'dev' into test
yunhao.wang af3cd73af4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 08d8281fd5 定时任务 
dashboard
wei.peng 5a5ed82201 添加 Cloud 获取组织或者部门下面的人员信息功能完成
wei.peng 43bf2d2dba 菜单添加首字母缩写功能 
部门管理 查询组织查询递归查询
wei.peng 9b1acb4b8f Merge branch 'dev' into test
wei.peng 18fa7b8e8e 用户菜单权限优化
yunhao.wang 7b2d7f78dd Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev
wei.peng 0988c1ad26 用户登录优化
yunhao.wang 8cb5c2ee1a Merge remote-tracking branch 'remotes/origin/dev' into test
alwaysfrin 6118568fd5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
alwaysfrin 1d4ab876c1 添加自定义组件
yunhao.wang cb8d841aee 解决冲突
wei.peng ffb29d0d03 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng c221d618ea 登录日志功能完成
yunhao.wang bb289774d9 dashboard部分功能 
修复bug
wei.peng 47105866be 合并代码 解决冲突
yunhao.wang c6399fb209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 4fe87c5ce2 解决bug
gragon.xu f43d392209 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
gragon.xu 46dc170d4c 单元测试：流程管家逻辑处理方法入参修改
wei.peng 22c9a7cc20 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
yunhao.wang 0d6963f36c 分支测试
wei.peng 786c652900 冲突解决 合并代码
wei.peng 95a58d97a2 冲突解决 合并代码
wei.peng bd3ab06440 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wei.peng 35ecf85881 冲突解决 合并代码
wei.peng 47dd4c68b5 配置文件修改 Test to dev
wei.peng 2ad41030e6 合并代码 并打开 MQ 以及邮箱
wei.peng 42b8443073 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
wei.peng cab08786f3 用户功能优化