Commit Graph
151 Commits
Author SHA1 Message Date
zjf dd983527f3 Merge branch 'master' into pjfk
# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
2025-07-09 12:28:26 +08:00
dzc f774f7313f feat:部门权限 2025-07-04 18:03:24 +08:00
dzc 285c05c2dd 删除注册用户 2025-07-03 19:52:47 +08:00
dzc c1f31aff0a feat:admin注册漏洞 2025-07-03 19:51:49 +08:00
dzc e1bf287e75 feat:用户导出重复 2025-06-24 15:17:38 +08:00
dzc 4daf78a001 feat:修改用户名 2025-06-24 14:56:56 +08:00
dzc 2468be98eb feat:部门权限 2025-06-23 15:41:52 +08:00
dzc 481e537d6c feat:用户导出bug 2025-06-23 14:49:34 +08:00
dzc d127f0be1e feat:部门权限 2025-06-23 10:44:14 +08:00
dzc 47d6fd77d0 feat:部门修改权限 2025-06-23 09:37:02 +08:00
zjf 8e9c65e31e 嘉兴访客系统 2025-06-04 15:51:29 +08:00
zjf ac709e77e6 嘉兴访客系统 2025-06-03 16:10:14 +08:00
dzc 189cb4a3e4 feat:人员调动tab 2025-05-29 15:39:57 +08:00
dzc e244dce601 11 2025-05-22 17:20:51 +08:00
dzc cd2646a822 feat:人脸审批显示部门 2025-05-20 17:37:17 +08:00
dzc d7615c1bde feat:转账排序 2025-05-19 19:02:36 +08:00
dzc 80e859781b feat:离职自动转账 2025-05-19 17:42:40 +08:00
dzc 8c5fa585a1 11 2025-05-15 09:55:28 +08:00
dzc 165070fa73 del:删除用户食堂字段 2025-05-14 20:06:09 +08:00
dzc 360fcf8c98 feat:用户商户部门 2025-05-14 19:36:01 +08:00
dzc 608a9c4bb6 feat:增加用户所属食堂 2025-05-14 16:45:27 +08:00
dzc d622e8cd90 feat:商户结账完成 2025-05-09 14:39:35 +08:00
dzc c519331054 fix:用户调岗 2025-05-09 09:48:49 +08:00
dzc 02c011a732 feat:第三方流水查询 2025-05-06 20:23:11 +08:00
dzc fb703a956d Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud 2025-05-06 15:42:20 +08:00
dzc e695b288d0 feat:第三方扣款、退款 2025-05-06 15:42:12 +08:00
zjf 3fcb4bfccc 用户下拉,供应商下拉接口添加id过滤 2025-05-06 15:02:25 +08:00
zjf 9ba291ff57 用户下拉,供应商下拉接口添加id过滤 2025-05-06 11:52:18 +08:00
zjf 68d2394a7b Merge branch 'master' of https://gitea.zianxin.com/zianxin-tec/biz-api-cloud 2025-05-06 10:47:31 +08:00
dzc 68419fe9ac feat:宁波银行权限校验 2025-05-06 10:35:41 +08:00
dzc da86fc3987 11 2025-04-28 18:07:35 +08:00
dzc 2db6f9b0ac feat:人脸列表 2025-04-28 14:51:21 +08:00
dzc 8a8c699757 fix:创建钱包bug
create:晚上订餐、广播、取餐
2025-04-27 17:17:17 +08:00
zjf 5e64f452ba 1 2025-04-27 16:37:25 +08:00
zjf f239198c07 Merge branch 'master' into jxfk
# Conflicts:
#	pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SimpleUserListVO.java
2025-04-25 15:45:35 +08:00
zjf a16ba88d4a 注释默认短信 2025-04-25 15:44:06 +08:00
dzc fc292a9904 feat:人脸审批管理权限控制 2025-04-25 15:20:21 +08:00
dzc f3ebae2ef4 fix:部门管理员查询bug 2025-04-25 14:50:24 +08:00
dzc b914931b37 feat:人员调动页面完成 2025-04-25 11:04:12 +08:00
dzc c2863a1d81 员工申请调岗 2025-04-24 22:12:32 +08:00
zjf cf68964a0d Merge remote-tracking branch 'origin/master' 2025-04-23 17:56:56 +08:00
zjf 4940d23ac3 诗画添加首次进入短信验证接口 2025-04-23 16:30:55 +08:00
dzc be284f19ad Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud 2025-04-23 09:56:00 +08:00
dzc 7a6a965bfd fix:适配一下多租户 2025-04-23 09:55:55 +08:00
zjf aa5281da83 设备指纹引入 2025-04-22 17:34:30 +08:00
zjf 4aa5b7310c 根据部门id获取用户 2025-04-22 13:00:18 +08:00
zjf 437e169e54 Merge remote-tracking branch 'origin/master' 2025-04-22 12:24:53 +08:00
zjf ccb7f885eb 主分支部门接口 2025-04-22 12:24:38 +08:00
dzc 7a463016ec 111 2025-04-21 16:48:33 +08:00
dzc 014c9ceb07 feat:人员调动 2025-04-21 15:44:18 +08:00