 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 |
|
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 |
|
gaowdong
|
29676f8ef6
|
订单log
|
2025-03-12 10:15:09 +08:00 |
|
sxu
|
907e9908a6
|
data permission
|
2025-03-11 17:09:45 +08:00 |
|
sxu
|
bb5f185cd7
|
Revert "移除 PERMISSION_STALL， 用PERMISSION_CANTEEN替代"
This reverts commit 324f56d922.
|
2025-03-11 16:55:47 +08:00 |
|
sxu
|
31e97b5d20
|
Merge remote-tracking branch 'origin/master'
|
2025-03-11 16:35:31 +08:00 |
|
sxu
|
12c384aff1
|
script
|
2025-03-11 16:35:20 +08:00 |
|
gaowdong
|
a14351ff63
|
设备端-支付/订单/菜谱
|
2025-03-11 15:20:47 +08:00 |
|
sxu
|
6043868db8
|
错误的角色类型
|
2025-03-11 14:47:03 +08:00 |
|
sxu
|
ff658d7571
|
Revert "data permission"
This reverts commit 7c20eb9b1d.
|
2025-03-11 14:25:53 +08:00 |
|
sxu
|
7c20eb9b1d
|
data permission
|
2025-03-11 14:22:46 +08:00 |
|
sxu
|
3bab462b7c
|
集团版--权限区域食堂档口树
|
2025-03-11 13:38:24 +08:00 |
|
sxu
|
324f56d922
|
移除 PERMISSION_STALL， 用PERMISSION_CANTEEN替代
|
2025-03-11 13:10:26 +08:00 |
|
sxu
|
3941dce9ee
|
data permission
|
2025-03-11 12:53:57 +08:00 |
|
sxu
|
e4b64130c8
|
getOrgIdListByUserEffId
|
2025-03-11 11:24:09 +08:00 |
|
sxu
|
6f7ee75ae7
|
apply datapermission
|
2025-03-10 19:08:37 +08:00 |
|
sxu
|
410193c53c
|
apply datapermission
|
2025-03-10 19:06:57 +08:00 |
|
sxu
|
f7f49960a1
|
Merge remote-tracking branch 'origin/master'
|
2025-03-10 19:02:42 +08:00 |
|
sxu
|
db6d6cc005
|
apply datapermission
|
2025-03-10 19:02:39 +08:00 |
 jjLv
|
0fd82446b7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/dto/SupermarketInfoPageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketConfigMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/model/SupermarketConfig.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/vo/SupermarketInfoPageVO.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketConfigMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketInfoMapper.xml
|
2025-03-10 18:50:23 +08:00 |