 sxu
|
b0c6d0e0a3
|
删除 MgrUser 相关
|
2025-03-14 16:29:24 +08:00 |
|
sxu
|
ade0d4dcef
|
删除 MgrUser 相关
|
2025-03-14 16:28:00 +08:00 |
|
sxu
|
c178261475
|
删除 MgrUser 相关
|
2025-03-14 16:27:21 +08:00 |
|
sxu
|
40d26de793
|
删除 MgrUser 相关
|
2025-03-14 16:19:06 +08:00 |
|
sxu
|
c26404a0d5
|
oauth
|
2025-03-13 21:20:56 +08:00 |
|
sxu
|
0a8c2b7b0b
|
oauth
|
2025-03-13 21:16:46 +08:00 |
|
sxu
|
98c210c386
|
oauth
|
2025-03-13 21:11:48 +08:00 |
|
sxu
|
875016d3e5
|
oauth
|
2025-03-13 21:07:25 +08:00 |
|
sxu
|
133848976f
|
oauth
|
2025-03-13 20:54:05 +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 |
|
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 |
|
jjLv
|
a046fc71b5
|
食堂：商品管理
|
2025-03-10 17:53:40 +08:00 |
|
sxu
|
c94153d979
|
LeNiuDataPermission fix
|
2025-03-10 17:29:53 +08:00 |
|
gaowdong
|
661f58b325
|
超市订单
|
2025-03-10 15:01:18 +08:00 |
|
gaowdong
|
a4ed486695
|
超市订单
|
2025-03-10 13:04:12 +08:00 |
|
sxu
|
77ce8969c9
|
Merge remote-tracking branch 'origin/master'
|
2025-03-10 11:10:44 +08:00 |
|
gaowdong
|
db302ee97b
|
超市订单
|
2025-03-10 10:33:45 +08:00 |
|
sxu
|
88e7a300cf
|
Revert "LeNiuDataPermission fix"
This reverts commit 8f3ae8526f.
|
2025-03-08 21:38:20 +08:00 |
|
sxu
|
b9875e3b21
|
Merge remote-tracking branch 'origin/master'
|
2025-03-07 19:48:30 +08:00 |
|
sxu
|
8f3ae8526f
|
LeNiuDataPermission fix
|
2025-03-07 19:48:23 +08:00 |
|
gaowdong
|
c55120e91c
|
Merge remote-tracking branch 'origin/master'
|
2025-03-07 18:33:21 +08:00 |
|
gaowdong
|
092bd3dddb
|
增加LeNiuDataPermission逻辑
|
2025-03-07 18:33:14 +08:00 |