yunhao.wang
|
0263ad0a90
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
|
7 years ago |
|
yunhao.wang
|
c4b0e3ba0e
|
解决bug
通用导入导出
用户导出
系统日志导出
操作日志导出
异常日志导出
|
7 years ago |
wei.peng
|
79ad222295
|
用户密码加密侧率功能完成
|
7 years ago |
Silliter
|
c45091584c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
alwaysfrin
|
b8a1196a45
|
添加自定义组件
|
7 years ago |
amy
|
879178697d
|
#
|
7 years ago |
|
amy
|
b2f6b3255a
|
实体修改
|
7 years ago |
|
Silliter
|
dd11ff1e71
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
0f0611d9ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
8d4d8c1b1a
|
开发返回pda实体
|
7 years ago |
|
amy
|
effa749d3f
|
#
|
7 years ago |
|
wei.peng
|
ff0cdb8abb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
ff4812ae04
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
afcfad8fdb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
2498c50bfd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
47ebc8795a
|
getSingleResult优化
|
7 years ago |
|
wei.peng
|
9064b6528b
|
树形结构查列表完成
|
7 years ago |
|
Silliter
|
65fead254f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
436f8ca139
|
解决bug
|
7 years ago |
|
Silliter
|
180c8c230c
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
02e31b07c8
|
定时任务日志完成
解决bug
|
7 years ago |
|
wei.peng
|
8a8f3dbb57
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
b3d7cb259e
|
组织管理父节点Bug 修复
复杂查询添加默认排序
|
7 years ago |
|
wei.peng
|
f87081f0d9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
7 years ago |
|
wei.peng
|
e01d83adca
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
5241d27279
|
账号管理功能更新
|
7 years ago |
|
yunhao.wang
|
c3ad998538
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
yunhao.wang
|
609c1557d3
|
bug解决
|
7 years ago |
|
wei.peng
|
3f6b281912
|
发版 2018年12月28日
|
7 years ago |
|
yunhao.wang
|
d30a3685d1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
4f828e8fab
|
定时任务重写
|
7 years ago |
|
alwaysfrin
|
2dedd836f5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
46335b8a81
|
redis会话优化
|
7 years ago |
|
Silliter
|
b8d4a3a08a
|
流程管家优化
|
7 years ago |
|
amy
|
cbf734b0b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
a4d59caaeb
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
Silliter
|
b4e1d97d10
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
Silliter
|
b55906ced0
|
生产领料优化
|
7 years ago |
gragon.xu
|
e167913e66
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
b41698ba1b
|
移库单信息BUG
|
7 years ago |
|
Silliter
|
a1ceda9f16
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
Silliter
|
3fcdba6c94
|
生产领料优化
|
7 years ago |
|
amy
|
339d04f56f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
gragon.xu
|
a5e05ef36e
|
修改流程管家在调组件之前对组件参数的过滤条件：组件参数类型为30的不用验证，组件名为prompt的不用验证
|
7 years ago |
|
amy
|
20cdd4170c
|
盘点状态实体枚举添加
|
7 years ago |
|
yunhao.wang
|
19e134074e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
yunhao.wang
|
ea621d14f8
|
定时任务修改
|
7 years ago |
|
wei.peng
|
bb9444fc91
|
用户登录信息封装
|
7 years ago |
|
wei.peng
|
00715312f0
|
根据组织Id 集合、部门ID 集合 查询账号信息
|
7 years ago |
|
wei.peng
|
0550adce28
|
用户管理更新
|
7 years ago |