wei.peng
|
9b1acb4b8f
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
18fa7b8e8e
|
用户菜单权限优化
|
7 years ago |
yunhao.wang
|
7b2d7f78dd
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
|
wei.peng
|
79ee50684e
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
wei.peng
|
0988c1ad26
|
用户登录优化
|
7 years ago |
|
yunhao.wang
|
8cb5c2ee1a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
7 years ago |
alwaysfrin
|
6118568fd5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
alwaysfrin
|
1d4ab876c1
|
添加自定义组件
|
7 years ago |
|
yunhao.wang
|
cb8d841aee
|
解决冲突
|
7 years ago |
|
wei.peng
|
ffb29d0d03
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
7 years ago |
|
wei.peng
|
c221d618ea
|
登录日志功能完成
|
7 years ago |
|
yunhao.wang
|
bb289774d9
|
dashboard部分功能
修复bug
|
7 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 |
|
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 |