 王杰
|
64d631c180
|
Merge branch 'test'
|
6 years ago |
jenkins
|
092f72872b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
wei.peng
|
4b17995206
|
LAC 日志记录Cache 完成
|
6 years ago |
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
b5685a7874
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
0e1220c329
|
Core 服务 用户查询优化
|
6 years ago |
|
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
cd74f5336f
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
689f6057c1
|
添加查询账号接口
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
crish
|
0924810e64
|
Merge branch 'test'
|
6 years ago |
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
de685a0627
|
删除pojo数据默认值
|
6 years ago |
|
汪云昊
|
bd55a18bf6
|
微服务接口 - 打印模板分页查询
|
6 years ago |
 曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
|
wei.peng
|
8f58627838
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
1e01f62188
|
Bug 修复
|
6 years ago |
jimmy.zeng
|
4bfa05698f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
6cbcea7c2c
|
系统菜单默认排序值改动
|
6 years ago |
|
crish
|
bbfc9b320f
|
Merge branch 'test'
|
6 years ago |
|
许心洁
|
04f8aaa783
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
eadb86ce60
|
excel通用导入优化
|
6 years ago |
|
曾贞一
|
ae12af551b
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
96a29d3de8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
90bb35c83f
|
用户默认分页配置功能开发
用户获取首页插件Bug 修复
|
6 years ago |
|
wei.peng
|
b34be0b86e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
2ef0dd5c3b
|
周期修改关联数据
|
6 years ago |
|
曾贞一
|
25e7ca08d3
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
7e5d2e1e56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
cf026d6dee
|
获取模板详情列表功能接口开发完成
|
6 years ago |
|
wei.peng
|
1f1a9c39fc
|
异常国际化功能开发完成
|
6 years ago |
|
crish
|
f7b366fe29
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
12a2a27b18
|
mes， pcn条码打印
Signed-off-by: crish <570360737@qq.com>
|
6 years ago |
|
曾贞一
|
18aff86ea0
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
856c77a965
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
|
wei.peng
|
0bc9f2e9bc
|
获取模板 微服务调用重新编写
|
6 years ago |
|
曾贞一
|
b10b967b73
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
WYnneaoapc
|
5e72d98ad8
|
提交
|
6 years ago |
|
WYnneaoapc
|
4ff3677fba
|
Merge branch 'test' into dev
|
6 years ago |
|
jimmy.zeng
|
a2a4dc6beb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
7eed51791f
|
软件适配器-定时适配任务
|
6 years ago |
|
汪云昊
|
b9d9d7402e
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
jimmy.zeng
|
b0d2812778
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
409c433b5c
|
添加字典分组
|
6 years ago |
|
曾贞一
|
fbe8544a02
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
wei.peng
|
aee54acafc
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
68e4b74e0a
|
平台权限系功能优化
|
6 years ago |
|
jimmy.zeng
|
c986f7b2a3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
9ee2901346
|
添加字典分组
优化redis资源键
|
6 years ago |
|
曾贞一
|
47d4a53706
|
Merge branch 'dev'
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
wei.peng
|
837d6ea567
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
5a6cd405b6
|
用户管理修改密码 Bug 修复
|
6 years ago |
peter.pan
|
19871c5f27
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
8f977719c0
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
ce7095932c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
peter.pan
|
47238f131b
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
8daa2789a4
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
7181e85ba5
|
安灯导出实体注解
定时任务日志添加字段
|
6 years ago |
|
许心洁
|
00fc0de4a9
|
冲突
|
6 years ago |
|
许心洁
|
742e0a6f49
|
冲突
|
6 years ago |
|
于学杰
|
6598a829e0
|
Merge branch 'dev'
|
6 years ago |
|
许心洁
|
98041fe58d
|
流程管家优化
|
6 years ago |
jenkins
|
812be94ed3
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
fb743ebafc
|
登录会话添加设备ID
自定义表单添加数据表唯一教研
自定义表单添加映射类型
|
6 years ago |
|
wei.peng
|
90048c3f0a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
934da4419f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
4f553c0857
|
添加序列化ID , 用户登录在线机制完成
|
6 years ago |
|
peter.pan
|
ad09180809
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
9ab2165086
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
67c70189b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
8461e12248
|
用户获取菜单信息调整
|
6 years ago |
|
peter.pan
|
0526fcf05c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
19afeb92b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
2a587524ff
|
基础操作,数据补全
|
6 years ago |
|
汪云昊
|
0ed90485a6
|
安灯基础数据导入导出
|
6 years ago |
|
wei.peng
|
353b8a37c5
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
wei.peng
|
6c57b8e10c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
2aa2dca77f
|
用户权限调整
|
6 years ago |
|
wei.peng
|
e1824dbba4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
be78ed2636
|
用户权限调整 帐号管理权限完成
|
6 years ago |
|
wei.peng
|
c858475bd2
|
用户权限调整 部门权限调整完成
|
6 years ago |
|
peter.pan
|
24f7ae3471
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
3a19888ddf
|
用户权限调整 岗位功能调整完成
|
6 years ago |
|
peter.pan
|
53d34096f7
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
8e39e6d9fb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
0041ce328e
|
定时删除日志
|
6 years ago |
|
peter.pan
|
d9ef2677fb
|
Merge branch 'dev' into test
|
6 years ago |
|
peter.pan
|
f4613c2f5c
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
0ca528bade
|
用户权限调整
|
6 years ago |
|
wei.peng
|
a1f8ca3096
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
曾贞一
|
71087e5d43
|
组织树 数据权限修复
|
6 years ago |
|
peter.pan
|
5741bfa2e6
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
5bed1d27ec
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
d7cb05e390
|
树DEMO 功能完成
|
6 years ago |
|
wei.peng
|
6cd229e286
|
本地无法启动,更新代码
|
6 years ago |
|
peter.pan
|
eeefb843b4
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
37b8755485
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
78cfff1748
|
功能优化
|
6 years ago |
|
wei.peng
|
9dc634d63e
|
用户查询功能优化
|
6 years ago |
|
peter.pan
|
c436c8ee3d
|
Merge branch 'test'
|
6 years ago |
|
peter.pan
|
b8730fac47
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
ac5bf14d6b
|
动态表单动态操作 功能优化
|
6 years ago |
|
peter.pan
|
628f1db31c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
4fe3701929
|
还原
|
6 years ago |
|
汪云昊
|
98de08ba4a
|
文件上传优化
字段删除异常
日志添加索引
|
6 years ago |
|
peter.pan
|
f4bf536296
|
Merge branch 'test'
|
6 years ago |
|
wei.peng
|
5d2695a5cb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
peter.pan
|
a551249165
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
30bed57c04
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
2eba4bb745
|
文件上传接口
excel通用导出优化
|
6 years ago |
|
wei.peng
|
1b4e5143aa
|
用户单帐号多平台登录
|
6 years ago |
|
wei.peng
|
aa23889514
|
Merge branches 'dev' and 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
jenkins
|
499edddace
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
于学杰
|
5d034e2a8a
|
1. 增加缺失的 agdId 字段
|
6 years ago |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
allen.zhang
|
d70f85d592
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
d2fd8b428c
|
作业记录复杂查询增加时间区间查询
|
6 years ago |
|
jenkins
|
911cb4ebfe
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
汪云昊
|
507c359067
|
平台字典优化
websocket
|
6 years ago |
wei.peng
|
27574f6076
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
92335a3db0
|
发布提交
|
6 years ago |
|
allen.zhang
|
e24e7ef421
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7831940c2a
|
FastDfs 添加日志
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
93ace83b5f
|
长文本数据类型
|
6 years ago |
|
wei.peng
|
302ac8a7e8
|
初始化功能目录
|
6 years ago |
|
allen.zhang
|
440083b5f2
|
Merge branch 'dev' into test
|
6 years ago |
alwaysfrin
|
d00c228823
|
事务调整及demo
|
6 years ago |
|
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
7edd35e688
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
aafa463afc
|
添加英文的时候字段长度不够，修改字段类型
|
6 years ago |
|
alwaysfrin
|
a1ccd25594
|
事务调整及demo
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
|
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
wei.peng
|
f5307b5ab3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
7349c5fb3a
|
添加注释
|
6 years ago |
|
jenkins
|
92e2b7fd84
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
85178af7f9
|
消息细节调整
|
6 years ago |
|
jenkins
|
4a5d0f0cb3
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
7f8217e644
|
清除测试类
|
6 years ago |
Silliter
|
3d56e2539d
|
合并dev代码
|
6 years ago |
|
yunhao.wang
|
eee0539562
|
sweb公告处理
|
6 years ago |
|
Silliter
|
0c12793473
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
3d3260c1a7
|
表单菜单权限接口
|
6 years ago |
|
Silliter
|
0f7695eab3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
85210d4ca1
|
优化流程管家
|
6 years ago |
|
Silliter
|
451b70acad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
0da89fa17e
|
表单-布局新增行列设置初始数据
SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整
|
6 years ago |
|
Silliter
|
4b440fc1f3
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
bd050ae3ac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yunhao.wang
|
5a4c85e409
|
消息附件管理
|
6 years ago |
|
Silliter
|
0fe1e95789
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
5ec2caf56d
|
优化查询封装实体
|
6 years ago |
|
Silliter
|
4c0116b082
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
6d8643da0c
|
权限分配调整接口
消息调整添加微服务支持
添加sweb通知处理队列
|
6 years ago |
|
Silliter
|
a4bc8ec6ca
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
5acf1ac8f5
|
Merge branches 'dev' and 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
eedfaf7392
|
优化流程管家
|
6 years ago |
|
crish
|
4dd872698b
|
流程管家：解决所有流程都走收获问题
|
6 years ago |
|
Silliter
|
7e3c43610f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
7b276e709b
|
流程日志明细查询优化
|
6 years ago |
|
Silliter
|
72e7759c8f
|
修改流程日志查询
|
6 years ago |
|
Silliter
|
76c5330a16
|
流程日志新增实体
|
6 years ago |
|
Silliter
|
5a1a84f10f
|
流程管家新增日志bug修改
|
6 years ago |
|
Silliter
|
ba3a542934
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
8684d95c1e
|
优化代码
|
6 years ago |
jiajack
|
3a5f43f97b
|
删除iml文件
|
6 years ago |
|
Silliter
|
d25902b294
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
f6ed505fc4
|
细节优化
bug修复
|
6 years ago |
|
Silliter
|
9c7665d354
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
2830bd0376
|
hql封装优化
|
6 years ago |
|
Silliter
|
e61669dd98
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
54f974ae89
|
微服文件管理接口
|
6 years ago |
|
wei.peng
|
93f4745afd
|
Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
# Conflicts:
# pom.xml
|
6 years ago |
|
yunhao.wang
|
513fa332c8
|
测试
|
6 years ago |
|
alwaysfrin
|
8fb36134a6
|
shiro会话id优化，自动update赋值优化
|
6 years ago |
|
Silliter
|
dbeb965e9b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
yunhao.wang
|
fc44c4919f
|
定时任务计划添加参数
|
6 years ago |
|
Silliter
|
111c6177c9
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
alwaysfrin
|
ea2eb6103d
|
优化调整
|
6 years ago |
|
Silliter
|
dd0af51d8f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
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 |
|
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 |