Commit Graph

268 Commits

Author SHA1 Message Date
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
gaowdong f5ec7117a5 h5-订单-待支付列表 2025-03-17 09:40:06 +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
jjLv 181fba02a9 write/off 2025-03-13 15:09:24 +08:00
sxu 10d4b6b56c healthbody 2025-03-13 11:04:47 +08:00
sxu 5d343bb555 healthbody 2025-03-13 10:47:45 +08:00
jjLv 7313121b92 获取指定角色用户列表--list/by/role 2025-03-13 09:55:14 +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 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 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
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