Commit Graph

255 Commits

Author SHA1 Message Date
sxu 56dddbf0b0 bug 5418 2025-03-26 16:51:47 +08:00
jjLv 6c11997813 虹软人脸识别 2025-03-26 16:42:51 +08:00
gaowdong 793d7ae5df 批量补扣 2025-03-26 16:02:36 +08:00
gaowdong 6b85c5f4cc 5415 2025-03-26 15:07:20 +08:00
sxu 99529aa002 bug 5414 2025-03-26 14:47:16 +08:00
sxu e3e870b0dc Revert "bug 5414"
This reverts commit 3c95cffc60.
2025-03-26 14:19:43 +08:00
sxu 3c95cffc60 bug 5414 2025-03-26 14:15:11 +08:00
sxu 68fba9da7d 加解密 2025-03-26 13:58:09 +08:00
sxu 0d56d317a2 bug 5418 2025-03-26 13:11:56 +08:00
sxu f4c97c5672 bug 5409 2025-03-25 19:19:50 +08:00
sxu 8f171ed0f2 改配置文件 2025-03-25 18:24:34 +08:00
gaowdong e370f209b9 补贴修改 2025-03-25 18:02:01 +08:00
gaowdong c09e12beff Merge remote-tracking branch 'origin/master' 2025-03-25 17:59:07 +08:00
gaowdong e47abd06db 补贴修改 2025-03-25 17:59:01 +08:00
sxu 4c2a9205d0 bug 5406 2025-03-25 17:51:33 +08:00
gaowdong 79fd70e701 双屏机-api 2025-03-25 16:42:23 +08:00
sxu 9cb0e5c4ec 清除mgr_role_user_org相关 2025-03-25 16:10:16 +08:00
sxu 5558a71f99 清除mgr_role_user_org相关 2025-03-25 16:05:29 +08:00
sxu 36cd73d0b9 清除custorg相关 2025-03-25 15:53:59 +08:00
sxu 63b9752eff 清除mgrrole相关 2025-03-25 15:49:01 +08:00
sxu 6c8eea05f5 设备获取超市物资 2025-03-24 18:39:13 +08:00
gaowdong 1f0e20d71c 双屏机-mq 2025-03-24 17:24:01 +08:00
sxu 4c8c0fdc5e Merge remote-tracking branch 'origin/master' 2025-03-24 16:25:17 +08:00
sxu b563839c88 增加账户 2025-03-24 16:25:14 +08:00
gaowdong 54a487a623 双屏机-mq 2025-03-24 15:46:50 +08:00
sxu 240ebbe008 增加账户 2025-03-24 14:57:19 +08:00
gaowdong 4927dbcf3a org full name 恢复 2025-03-21 18:18:05 +08:00
gaowdong 1b4566531e 文件替换 2025-03-21 16:59:03 +08:00
gaowdong 3067c773e9 Merge remote-tracking branch 'origin/master' 2025-03-21 16:50:35 +08:00
gaowdong 6089182292 web端账户相关信息导出 2025-03-21 16:50:28 +08:00
sxu c032249e5c 区域树筛选bug 2025-03-21 14:27:21 +08:00
gaowdong 723aa6bb8f 补贴管理-补贴规则 2025-03-21 13:25:25 +08:00
gaowdong 02beddf5ee Merge remote-tracking branch 'origin/master' 2025-03-21 11:26:01 +08:00
gaowdong 6149dc5c6b 消费管理 2025-03-21 11:25:37 +08:00
sxu 6de8507f30 超管权限 2025-03-21 09:32:13 +08:00
sxu 743a7060fa 设备登录 2025-03-20 19:43:25 +08:00
gaowdong 2883a201fa Merge remote-tracking branch 'origin/master' 2025-03-20 18:34:11 +08:00
gaowdong bddfaf5c26 补贴管理 2025-03-20 18:34:05 +08:00
sxu 481834f7ac 设备认证 2025-03-20 18:16:25 +08:00
sxu 2f22341e16 设备认证 2025-03-20 16:57:48 +08:00
gaowdong 2fe984f268 账户消费 2025-03-20 14:10:03 +08:00
sxu 34e5ad299e 解密 2025-03-19 19:51:30 +08:00
sxu d2119b0cbc Revert "mgruser"
This reverts commit ab986c3c41.
2025-03-19 19:49:25 +08:00
sxu ab986c3c41 mgruser 2025-03-19 18:26:32 +08:00
sxu f4cf35091e Merge remote-tracking branch 'origin/master' 2025-03-19 14:55:21 +08:00
sxu 2ffab1e0a6 Revert "获取指定角色用户列表--list/by/role"
This reverts commit 7313121b92.
2025-03-19 14:54:54 +08:00
sxu 20e831b0b4 Revert "删除获取指定角色用户列表"
This reverts commit b49f1cc844.
2025-03-19 14:53:57 +08:00
sxu 4fc0d2fcef Revert "mgruser"
This reverts commit 4fc252b44f.
2025-03-19 14:53:45 +08:00
gaowdong 9b9e7b2b77 账户管理 2025-03-19 14:49:13 +08:00
sxu 4fc252b44f mgruser 2025-03-19 14:29:06 +08:00
gaowdong c8b12d2a17 Merge remote-tracking branch 'origin/master' 2025-03-19 11:15:18 +08:00
gaowdong d6328902c9 双屏机-设备接口-设备时间下发 2025-03-19 11:15:03 +08:00
jjLv 173b5cace9 Merge remote-tracking branch 'origin/master' 2025-03-19 10:34:16 +08:00
jjLv b49f1cc844 删除获取指定角色用户列表 2025-03-19 10:24:54 +08:00
gaowdong 8e106fd5ca Merge remote-tracking branch 'origin/master' 2025-03-18 16:22:48 +08:00
gaowdong fe79f504d3 双屏机-设备接口-交换密钥 2025-03-18 16:22:40 +08:00
gaowdong a2d8722a6d 双屏机-设备接口 2025-03-18 14:33:00 +08:00
sxu a9027f2973 SUPER_ADMIN_ROLE_KEY 2025-03-18 11:34:00 +08:00
jjLv 181fba02a9 write/off 2025-03-13 15:09:24 +08:00
jjLv 7313121b92 获取指定角色用户列表--list/by/role 2025-03-13 09:55:14 +08:00
jjLv 340329874d Merge remote-tracking branch 'origin/master' 2025-03-13 09:29:58 +08:00
sxu 91880d8096 ROLE_ADMIN 2025-03-18 09:28:04 +08:00
sxu ed756d6399 SecureManager delete 2025-03-17 19:25:44 +08:00
gaowdong c6696e6aed 双屏机-设备接口 2025-03-17 18:14:38 +08:00
gaowdong 17c1529d86 h5-订单-待支付列表 2025-03-17 09:48:14 +08:00
sxu fe51edfd94 Merge branch 'ah-sbd-h5' 2025-03-15 18:15:04 +08:00
sxu d099199a8e get token 2025-03-15 16:53:35 +08:00
sxu 501759fa68 get token 2025-03-15 16:28:14 +08:00
sxu 17c4508aad get token 2025-03-14 17:45:25 +08:00
sxu 852705bff1 get token 2025-03-14 17:13:50 +08:00
sxu 517b804dbd get token 2025-03-14 17:09:40 +08:00
gaowdong f3d4bdb3a8 Merge remote-tracking branch 'origin/master' 2025-03-14 16:46:56 +08:00
gaowdong 85e3ce7fc0 修改注释 2025-03-14 16:46:49 +08:00
sxu 8332089a7a 删除 MgrUser 相关 2025-03-14 16:04:42 +08:00
gaowdong 4e280b7b6d 替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
2025-03-14 14:14:14 +08:00
gaowdong 41fb46a8ca Merge remote-tracking branch 'origin/master' into replace_table 2025-03-14 13:40:03 +08:00
gaowdong 0a14a5e77a 替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
2025-03-14 13:39:37 +08:00
gaowdong c040602a3c 替换 mgr_role_canteen 表为 sys_role_canteen
替换 mgr_role_warehouse 表为 sys_role_warehouse
2025-03-14 13:08:35 +08:00
gaowdong 31b5076320 替换 mgr_role_area 表为 sys_role_area 2025-03-14 11:17:41 +08:00
gaowdong 9c6ca487f0 替换 mgr_role_org 表为 sys_role_dept 2025-03-14 10:51:12 +08:00
gaowdong ba0a45ed8f 替换 mgr_user_role 表为 sys_user_role 2025-03-14 10:35:49 +08:00
gaowdong 7c7217eb30 替换 mgr_role 表为 sys_role 2025-03-14 10:22:40 +08:00
gaowdong 69e6660e81 替换 cust_info 表为 sys_user 2025-03-13 18:16:12 +08:00
sxu 53b52e7ba2 healthbody 2025-03-13 17:07:43 +08:00
sxu a1b1a18d4d healthbody 2025-03-13 17:01:04 +08:00
sxu c4c677a08f fix conflict 2025-03-13 11:19:02 +08:00
sxu 10d4b6b56c healthbody 2025-03-13 11:04:47 +08:00
sxu 5d343bb555 healthbody 2025-03-13 10:47:45 +08:00
sxu dd28640b3b healthbody 2025-03-13 09:45:56 +08:00
sxu 9d0284a032 healthbody 2025-03-13 09:37:39 +08:00
jjLv 16c6801456 MAPPER位置更改 2025-03-13 09:29:44 +08:00
jjLv ae3fcf6b50 Merge remote-tracking branch 'origin/master' 2025-03-13 15:10:25 +08:00
jjLv 89d5369c4f 食堂:消费机菜单 2025-03-14 11:13:18 +08:00
sxu 3a2a90fe24 healthbody 2025-03-13 09:22:42 +08:00
sxu c58ecd61b8 healthbody 2025-03-12 22:02:40 +08:00
sxu f00653630b healthbody 2025-03-12 21:52:11 +08:00
sxu 3a8c9344c7 healthbody 2025-03-12 20:26:59 +08:00
gaowdong e01f117a07 Merge remote-tracking branch 'origin/master' into replace_table 2025-03-12 16:24:33 +08:00
gaowdong 2e272af445 替换 cust_org 表为 sys_dept 2025-03-12 16:22:41 +08:00
sxu d0d82b173b Merge branch 'ah-sbd-h5' 2025-03-12 10:17:54 +08:00