nies
|
a51430c646
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
|
nies
|
f6a3e617cd
|
新增账号导出的接口
|
4 years ago |
wynne1005
|
d39b9cbe7c
|
还原pom
|
4 years ago |
|
wynne1005
|
558f2c4a61
|
添加系统菜单背景图片字段
|
4 years ago |
|
wynne1005
|
004346de51
|
删除.DS_STORE
|
4 years ago |
|
wynne1005
|
f5e011789d
|
还原pom
|
4 years ago |
|
wynne1005
|
6864f585b9
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
76a44d7f09
|
添加获取用户接口，对象版本
|
4 years ago |
|
nies
|
dc40132655
|
用户导出增加默认值
|
4 years ago |
|
nies
|
90bd2efec1
|
修改sysuserInfocontroller batch-delete 为软删除
|
4 years ago |
|
wynne1005
|
e014266277
|
引入import
|
4 years ago |
|
wynne1005
|
b4310bd87c
|
添加权限变更记录
|
4 years ago |
|
wynne1005
|
d7adbed7ff
|
删除DS_STORE
|
4 years ago |
|
wynne1005
|
0beaca750a
|
天津it审核需求
|
4 years ago |
|
wynne1005
|
bb9f3a487e
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
d9ea9c63ee
|
feat(core): 添加根据组织 查询下面用户接口
添加根据组织 查询下面用户接口
|
4 years ago |
|
wynne1005
|
8fecb1f7d8
|
还原merge pom
|
4 years ago |
|
wynne1005
|
f8b6226dc5
|
fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
|
4 years ago |
|
wynne1005
|
c67b054a75
|
fix(core): 升级mysql controller添加名称
升级mysql controller添加名称
|
4 years ago |
|
wynne1005
|
1fef53f736
|
松下密码修改之后需要登录时重新修改
|
4 years ago |
|
wynne1005
|
43954e01c7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
陆卫豪
|
e56b371e59
|
Merge pull request 'test 松下 bug15455 ,手工修改用户密码' (#14) from castle.zang/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-core/pulls/14
|
4 years ago |
|
wynne1005
|
345d2e835a
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
b4994d77e1
|
添加松下密码重置策略
|
4 years ago |
|
wynne1005
|
850684545c
|
松下：创建用户 该用户第一次登录时需要重置密码
|
4 years ago |
castle.zang
|
c3f8723d2d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
|
wynne1005
|
159a2d2fc7
|
解决松下16110变更 平台安全策略优化更新
|
4 years ago |
|
castle.zang
|
3522a8f605
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
|
castle.zang
|
721a00d64f
|
bug 15455 重置用户密码
|
4 years ago |
|
wynne1005
|
5421438b3d
|
merge dev
|
4 years ago |
|
wynne1005
|
96be60b6df
|
修复修改密码值问题
|
4 years ago |
|
castle.zang
|
1c0d29c7e8
|
Merge remote-tracking branch 'upstream/test' into test
|
4 years ago |
|
wynne1005
|
f732b3f07d
|
还原资源获取
|
4 years ago |
|
wynne1005
|
fb071a4faf
|
还原syslocaleres
|
4 years ago |
|
wynne1005
|
0a3d026643
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
|
4 years ago |
|
castle.zang
|
dd6e757499
|
Merge branch 'upstreamTest' into test
|
4 years ago |
|
castle.zang
|
897b63151f
|
增加职位查询，部门查询返回值泛型
|
4 years ago |
|
wynne1005
|
d643545b1f
|
merge 请求 处理冲突
|
4 years ago |
 臧学普
|
8d8ee27b51
|
Merge pull request 'Merge pull request 'UAT Sweb创建账号优化 #15180' (#13) from castle.zang/i3plus-core:test into test' (#1) from i3-IMPP/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/castle.zang/i3plus-core/pulls/1
|
4 years ago |
|
陆卫豪
|
133bad15bf
|
Merge pull request 'UAT Sweb创建账号优化 #15180' (#13) from castle.zang/i3plus-core:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-core/pulls/13
|
4 years ago |
|
wynne1005
|
f46e5d0bd7
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
3f57a0b48d
|
删除不需要的pom
|
4 years ago |
|
wynne1005
|
e15e55aedb
|
更换钉钉jar路径
|
4 years ago |
|
castle.zang
|
f84f7db414
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
castle.zang
|
d4f3e8b324
|
WIP:UAT-用户管理优化修改 15179
|
4 years ago |
|
wynne1005
|
762458a1d5
|
feat(core): 平台添加用户名登录方式 支持钉钉授权
平台添加用户名登录方式 支持钉钉授权
|
4 years ago |
|
castle.zang
|
909de971e1
|
UAT-用户管理优化修改 15179
|
4 years ago |
|
castle.zang
|
10d50ad43d
|
UAT Sweb创建账号优化 #15180
|
4 years ago |
|
wynne1005
|
c65a1d735c
|
fix(core): 添加 未添加至国际化的资源
添加 未添加至国际化的资源
|
4 years ago |
汪云昊
|
3518567099
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
Conflicts:
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
|
4 years ago |