Commit Graph

115 Commits (13ae7cf32dd66e543e6046004ed7c9bc1ca93e8b)

Author SHA1 Message Date
SondonYong ccb520416f dev:人资相关代码 2025-12-05 17:35:02 +08:00
SondonYong 6d89fa3b26 dev:人资相关, 解除部分验证码校验 2025-12-05 14:18:28 +08:00
SondonYong 7629c1e68f Merge remote-tracking branch 'origin/main' into main 2025-12-05 10:19:59 +08:00
SondonYong dd325155cb dev:app端入职插入user_corp_record表 2025-12-05 10:19:37 +08:00
zhaokai 40b5a4ce58 离职入职相关 2025-12-05 10:14:01 +08:00
zhaokai 1da601c77b 离职入职相关 2025-12-04 15:02:21 +08:00
SondonYong d5f31da708 dev:app端扫码入职 2025-12-04 09:45:37 +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 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 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 d028887a3c 用户添加是否流动人员标志 2025-12-02 10:15:35 +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
zhaokai 4cfd50d167 企业添加开户人和选取形式字段 2025-12-01 13:32:04 +08:00
SondonYong 61b3655b0a dev:文案修改:入职->在职 2025-12-01 10:40:34 +08:00
zhaokai 79f0b075dc 统一用户管理修复 2025-12-01 09:11:35 +08:00
zhaokai bdc6c47493 修改用户排序 2025-11-28 16:52:35 +08:00
SondonYong 5c57c12ea4 Merge remote-tracking branch 'origin/main' into main 2025-11-28 15:39:15 +08:00
SondonYong eac75ce415 dev:人员导入(部门岗位反哺版) 2025-11-28 15:39:12 +08:00
zhaokai c8f344ebe2 根据登录人密码获取查询人手机号和身份证号 2025-11-28 14:21:30 +08:00
zhangyue f2b527d32a 1.修改密码 2.禁用租户 2025-11-27 15:03:38 +08:00
zhangyue efee0d58ce 修改企业新增 2025-11-25 15:53:57 +08:00
SondonYong 051deb72b7 dev:代码规范 2025-11-24 15:47:53 +08:00
zhangyue 9c84548f12 用户批量导入 2025-11-22 17:15:17 +08:00
SondonYong 0888004dfc fixed:引入smb包 2025-11-21 17:52:32 +08:00
zhangyue 29d03cb87f 用户新增 age, birthday, and sex 2025-11-21 17:31:08 +08:00
SondonYong 926a1fc891 fixed:新增校验统一社会信用代码是否重复接口;人员资质证书列表新增返回参数 2025-11-21 17:14:02 +08:00
zhangyue ff5cbfb094 1.增加重置密码功能
2.增加用户新增验证
2025-11-21 15:43:51 +08:00
SondonYong 8e5559c9e0 fixed:11976 3端都有 社会统一信用代码没有判重 2025-11-21 09:11:15 +08:00
SondonYong 2848a33125 dev:人员导入去除岗位必填的校验 2025-11-20 11:37:48 +08:00
zhaokai 4bfbcdb7ab 部门调整父部门是0 2025-11-20 11:21:16 +08:00
zhangyue 38a8775824 用户列表查询接口 2025-11-20 11:17:03 +08:00
zhangyue 3f47a0ee18 用户列表查询 2025-11-20 10:27:34 +08:00
zhaokai c08f72cde9 修改企业枚举 2025-11-19 09:27:49 +08:00
zhangyue 7c91d615b5 修改新增用户默认值 2025-11-18 17:53:56 +08:00
zhangyue 4f6f629885 修改文件上传、新增用户、新增部门 2025-11-18 14:31:59 +08:00
zhangyue ae0f84b10d gbs底座数据互通 2025-11-18 09:04:37 +08:00
SondonYong c14eb8e8a0 dev:代码规范修改 2025-11-17 15:00:11 +08:00
SondonYong b01cec1375 dev:导出用户修改 2025-11-13 10:56:39 +08:00