Commit Graph

172 Commits

Author SHA1 Message Date
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