Commit Graph

255 Commits (e786fecd88e8c0d992f43950bcc5b9615c46230a)

Author SHA1 Message Date
SondonYong e786fecd88 dev:app端扫码入职流程代码修改 2025-12-04 15:07:10 +08:00
SondonYong 9ae0caad52 dev:app端扫码入职流程代码修改 2025-12-04 10:01:19 +08:00
SondonYong d5f31da708 dev:app端扫码入职 2025-12-04 09:45:37 +08:00
SondonYong 905de45218 Merge remote-tracking branch 'origin/main' into main 2025-12-04 09:38:29 +08:00
SondonYong f172b8544d dev:app端忘记密码 2025-12-04 09:37:59 +08:00
SondonYong ac54d25ab4 dev:app端忘记密码 2025-12-04 09:35:40 +08:00
zhaokai 2d63d0715e 离职入职相关 2025-12-04 09:14:31 +08:00
SondonYong 8515519038 dev:app入职相关接口 2025-12-04 08:43:47 +08:00
zhaokai f6b859b5d9 离职入职相关 2025-12-03 16:32:54 +08:00
zhaokai 5b6233931f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
2025-12-03 16:31:47 +08:00
zhaokai 141f6cfed8 离职入职相关 2025-12-03 16:31:02 +08:00
SondonYong 67654360ea Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	web-adapter/src/main/java/com/zcloud/basic/info/app/AppUserController.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
#	web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
2025-12-03 16:19:01 +08:00
SondonYong 0a2315b30b dev:app入职相关接口 2025-12-03 16:17:58 +08:00
zhaokai a0a4bf884f 离职入职相关 2025-12-03 16:01:20 +08:00
zhaokai 80c1bdf5c0 离职入职相关 2025-12-03 16:00:12 +08:00
zhaokai ffe3d0d981 离职入职相关 2025-12-03 15:58:10 +08:00
zhaokai a6c6ca6241 离职入职相关 2025-12-03 15:56:59 +08:00
SondonYong ce6f71a9ac dev:app相关接口 2025-12-03 14:00:03 +08:00
zhaokai 973b93d749 添加状态 2025-12-03 08:54:57 +08:00
zhaokai e0ed80a261 用户离职相关,流动人员,等 2025-12-03 08:19:22 +08:00
SondonYong 6340fc6149 dev:修改 2025-12-02 18:14:42 +08:00
SondonYong f1ddba3960 dev:修改字段 2025-12-02 17:56:40 +08:00
SondonYong dc9840c477 init: 代码初始化:1.用户变更记录,2.用户工作交接 2025-12-02 14:17:33 +08:00
zhaokai e94563be9d 用户添加岗位名称 2025-12-02 10:46:20 +08:00
zhaokai d028887a3c 用户添加是否流动人员标志 2025-12-02 10:15:35 +08:00
zhaokai 2bc55c2e2f 相关方用户新增和部门新增校验是否完善企业信息 2025-12-01 17:13:16 +08:00
SondonYong 06d2957b4f Merge remote-tracking branch 'origin/main' into main 2025-12-01 16:40:44 +08:00
zhaokai 5c683b4d4a 企业增加多选条件及开户人 2025-12-01 16:23:53 +08:00
SondonYong 16e852b061 dev:岗位管理去除是否监管岗位 2025-12-01 15:56:50 +08:00
SondonYong 5c14e5caa0 dev:人员列表手机号脱敏 2025-12-01 15:41:15 +08:00
SondonYong a40da1d572 dev:人员列表新增在职状态筛选 2025-12-01 15:04:09 +08:00
SondonYong c3243cef93 dev:监管端/企业端,岗位新增去除岗位职责必填校验 2025-12-01 14:42:32 +08:00
zhaokai 51e98fe36b 部门级别非必填 2025-12-01 13:59:13 +08:00
zhaokai 4cfd50d167 企业添加开户人和选取形式字段 2025-12-01 13:32:04 +08:00
SondonYong d16689e719 Merge remote-tracking branch 'origin/main' into main 2025-12-01 11:36:46 +08:00
SondonYong ee8f8f6a4a dev:新增移动端上传用户人脸照片接口 2025-12-01 11:36:37 +08:00
zhangyue 437880dccd 新增部门dubbo接口增加参数 2025-12-01 11:33:29 +08:00
SondonYong 55b17b944b dev:新增用户时手机号不能为空校验 2025-12-01 10:48:41 +08:00
SondonYong 61b3655b0a dev:文案修改:入职->在职 2025-12-01 10:40:34 +08:00
SondonYong a5aba89f61 dev:新增用户默认入职 2025-12-01 10:37:26 +08:00
SondonYong a342c9e3cf dev:人员列表新增根据角色id查询条件 2025-12-01 10:12:29 +08:00
SondonYong 2a8632f93c Merge remote-tracking branch 'origin/main' into main 2025-12-01 09:55:23 +08:00
SondonYong 8deab6fdf5 dev:岗位列表查询修改 2025-12-01 09:55:19 +08:00
zhaokai 79f0b075dc 统一用户管理修复 2025-12-01 09:11:35 +08:00
SondonYong 77e4e6adf0 dev:是否为部门负责人:改为必填 2025-12-01 08:58:16 +08:00
SondonYong 45c6a46e96 dev:人员导入(部门岗位反哺版) 2025-11-29 11:19:37 +08:00
SondonYong 2f37b250b1 Merge remote-tracking branch 'origin/main' into main 2025-11-28 16:52:53 +08:00
SondonYong 226ada2536 dev:人员导入(部门岗位反哺版) 2025-11-28 16:52:42 +08:00
zhaokai bdc6c47493 修改用户排序 2025-11-28 16:52:35 +08:00
SondonYong 9b98f81d2c dev:人员导入(部门岗位反哺版) 2025-11-28 15:41:41 +08:00