zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,140 Commits 2 Branches 0 Tags
09f65b264a1ff2bba449e7c8ea2e9288ff5e137d
Commit Graph
75 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 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 02c011a732 feat:第三方流水查询 2025-05-06 20:23:11 +08:00
dzc 68419fe9ac feat:宁波银行权限校验 2025-05-06 10:35:41 +08:00
dzc 2db6f9b0ac feat:人脸列表 2025-04-28 14:51:21 +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
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
dzc 7a463016ec 111 2025-04-21 16:48:33 +08:00
dzc 014c9ceb07 feat:人员调动 2025-04-21 15:44:18 +08:00
dzc e2bd15a650 feat:生成用户调岗代码 2025-04-21 15:29:24 +08:00
dzc 9b30b1337f feat:判断用户移动端角色 2025-04-18 17:39:05 +08:00
zjf f59bad4dbe jx访客 2025-04-15 17:09:53 +08:00
zjf 3ab0cbef40 访客接口，对指定用户下线功能-1 2025-04-10 17:03:29 +08:00
dzc ca1295434f feat:商户规则绑定 2025-03-29 18:05:34 +08:00
dzc ffee069910 feaet:充值同步到正元 2025-03-29 10:38:47 +08:00
dzc 2fffce5db5 fix:部门报表逻辑修改 2025-03-24 17:24:29 +08:00
dzc 88b23c696a 111 2025-03-22 18:04:17 +08:00
dzc b7d7996c25 feat:部门、商户添加是否同步到正元 2025-03-21 18:39:57 +08:00
zjf 01e5715351 包厢修改 2025-03-20 14:03:33 +08:00
dzc de8d31cf46 feat:人脸角色审批 2025-03-13 21:08:58 +08:00
dzc 4c4c7e9081 feat:人员人脸审批 2025-03-13 18:12:27 +08:00
dzc 4382c13d8a feat:正元同步部门、身份、商户信息、自动创建并且绑定饭卡、正元id字典 2025-03-04 22:43:36 +08:00
dzc 54a46dd9ee 正元同步 2025-03-04 15:31:52 +08:00
dzc dd1991fead feat:财务报表优化树形搜索 2025-02-27 20:16:54 +08:00
zjf aeaea0b325 修复 2025-02-26 13:35:24 +08:00
dzc 8c18dbeb1c feat:导入金额查询 2025-02-24 12:17:02 +08:00
dzc c2a8b38c7d Merge branch 'master' of http://gitea.zianxin.com/zianxin/biz-api-cloud 2025-02-21 11:06:20 +08:00
dzc 5d04194db9 feat:财务报表导出 2025-02-21 11:06:16 +08:00
zjf f948217557 Merge remote-tracking branch 'origin/master' 2025-02-20 10:39:28 +08:00
zjf 7bd587265a 1 2025-02-20 10:39:12 +08:00
dzc 9a8c7d5ace feat:记录导出增加部门搜索 2025-02-19 15:19:20 +08:00
dzc 334b65799f feat:部门交易记录修改 2025-02-19 10:04:26 +08:00
dzc e32f4ea263 feat:钱包开卡取消绑定、按钮权限 2025-02-17 16:11:51 +08:00
zjf 89bd014f11 更新工作流模块，修复dept和user接口feign远程调用问题 2025-02-06 17:14:38 +08:00
dzc b5666485de feat:部门交易金额导出 2025-01-23 14:22:03 +08:00
dzc 7e1be7ef2f feat:部门交易记录 2025-01-23 13:12:31 +08:00
dzc 811f1e79aa feat:充值流水统计 2025-01-20 20:30:47 +08:00
dzc 3231303204 fix:人员查询bug修改 2025-01-19 16:09:32 +08:00