275 Commits (a7833ea9dd301ec16f374363adcc994bcfb8c1fd)

Author SHA1 Message Date
yunhao.wang 2ba8b1498b 字典微服务调整
定时任务优化
自定义表单实体
6 years ago
yunhao.wang 5f746792c5 字典微服务调整
定时任务优化
6 years ago
yunhao.wang 498fbea67b 定时任务微服优化 6 years ago
Silliter 618ce5d560 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
Silliter c4ef1e66f3 开发条码打印后端 6 years ago
wei.peng 8ec8dba414 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 9f41b29d95 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang 4055e6fa76 字典调整 6 years ago
alwaysfrin 7e9704db00 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin fd6552b4ac 定时任务封装 6 years ago
Silliter 05efe333cc 开发打印模板功能 6 years ago
Silliter de5760bba1 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 307f07e7ed 条码规则管理
微服条码解析
6 years ago
wei.peng 0a5c19ebe5 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 2943bfcf9f 添加批量删除任务计划功能 6 years ago
Silliter cc4484a562 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 8e029e82e0 报表优化
解决bug
邮件消息优化
6 years ago
yunhao.wang 4154b60249 报表优化
解决bug
6 years ago
yunhao.wang adfe3cb2e6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang ba36cfecd5 报表优化
国际化接口
6 years ago
yunhao.wang dedc7b45fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yunhao.wang b01e479cb3 报表优化
impp压测接口优化
消息队列非空验证
单号管理增加状态
6 years ago
wei.peng 3fce943723 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng d9d38bd991 自定义报表 获取目录接口功能完成 6 years ago
yunhao.wang 02f95f0939 性能测试 6 years ago
yunhao.wang a68771db32 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 23450c0218 bug解决
操作日志添加人员登录名称
6 years ago
yunhao.wang fef135791c 定时任务异常通知
网关返回信息类型改为 BaseResultBean
添加队列监听开关
6 years ago
alwaysfrin 16daf7c1b9 修改了 6 years ago
wei.peng a2bbd4b5f0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 19a8189b05 模板管理 后台功能完成 6 years ago
wei.peng 2bd16137bd 模板管理 后台功能完成 6 years ago
yunhao.wang d0cee703fe 测试邮件发送 6 years ago
yunhao.wang 7d4f3ebb67 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 77296816e6 通用导出
单号规则导入导出
系统参数添加组
6 years ago
yunhao.wang c4b0e3ba0e 解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
6 years ago
wei.peng ff0cdb8abb Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 9064b6528b 树形结构查列表完成 6 years ago
Silliter 65fead254f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 436f8ca139 解决bug 6 years ago
Silliter 180c8c230c Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
yunhao.wang 02e31b07c8 定时任务日志完成
解决bug
6 years ago
wei.peng 8a8f3dbb57 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng b3d7cb259e 组织管理父节点Bug 修复
复杂查询添加默认排序
6 years ago
wei.peng e01d83adca Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 5241d27279 账号管理功能更新 6 years ago
wei.peng 3f6b281912 发版 2018年12月28日 6 years ago
yunhao.wang 4f828e8fab 定时任务重写 6 years ago
Silliter a4d59caaeb Merge remote-tracking branch 'remotes/origin/dev' into test 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
Silliter 8fa14247f5 解决冲突 6 years ago
Silliter cc3bb9e9ae Merge remote-tracking branch 'remotes/origin/dev' into test 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
wei.peng 38be37aad0 Merge branch 'dev' into test 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 9b1acb4b8f Merge branch 'dev' into test 6 years ago
wei.peng 18fa7b8e8e 用户菜单权限优化 6 years ago
yunhao.wang 7b2d7f78dd Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 79ee50684e Merge remote-tracking branch 'origin/dev' into dev 6 years ago
wei.peng 0988c1ad26 用户登录优化 6 years ago
yunhao.wang 8cb5c2ee1a Merge remote-tracking branch 'remotes/origin/dev' into test 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
wei.peng 47105866be 合并代码 解决冲突 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