 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 |
|
sxu
|
cf2daeb670
|
添加uptime
|
2025-03-07 18:25:10 +08:00 |
|
sxu
|
17ac900ddd
|
Merge branch 'ah-sbd-h5'
|
2025-03-07 18:23:42 +08:00 |
|
sxu
|
175f339a53
|
添加uptime
|
2025-03-07 18:21:27 +08:00 |
|
gaowdong
|
d936979dc4
|
增加LeNiuDataPermission逻辑
|
2025-03-07 17:39:32 +08:00 |
|
gaowdong
|
db1e876bc6
|
删除@RequiresAuthentication
|
2025-03-07 14:12:16 +08:00 |
|
jjLv
|
2b01a92d34
|
食堂：pfy_菜品灶类信息管理、gyp_菜品功效控制器、pfy_菜品导入失败记录、pfy_菜品标签基础信息管理、gyp_菜系控制器、gyp_适宜人群控制器、pfy_菜品口味信息管理
|
2025-03-07 13:59:18 +08:00 |
|
gaowdong
|
356f3bd096
|
线上线下消费
|
2025-03-07 13:47:07 +08:00 |
|
sxu
|
2794953094
|
Merge branch 'ah-sbd-h5'
|
2025-03-07 12:17:32 +08:00 |
|
sxu
|
76e8caf1ef
|
添加uptime
|
2025-03-07 12:16:46 +08:00 |
|
sxu
|
d71c8b3b2d
|
改为sys_role and sys_user_role
|
2025-03-06 19:16:17 +08:00 |
|
sxu
|
84936608f7
|
改为sys_role and sys_user_role
|
2025-03-06 18:00:58 +08:00 |
|
jjLv
|
739fb39367
|
食堂：接口迁移
|
2025-03-06 17:46:50 +08:00 |
|
gaowdong
|
f772514283
|
线上线下消费
|
2025-03-06 17:12:12 +08:00 |
|
sxu
|
8206e7c962
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 15:54:11 +08:00 |
|
sxu
|
b62326f45c
|
获取角色
|
2025-03-05 15:54:07 +08:00 |
|
gaowdong
|
4ac8211277
|
获取指定日期菜谱计划菜品详情
|
2025-03-05 14:43:26 +08:00 |
|
sxu
|
26e913bcc6
|
获取所有类别的树形结构
|
2025-03-05 14:35:09 +08:00 |
|
sxu
|
f2f46b195a
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 14:33:25 +08:00 |
|
sxu
|
5eea4dbb4f
|
路径错误
|
2025-03-05 14:33:19 +08:00 |
 tqzhang
|
7f6b8e3255
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 14:30:39 +08:00 |
|
tqzhang
|
7683cd39c7
|
后台-菜谱计划发布v2
|
2025-03-05 14:30:12 +08:00 |
|
sxu
|
e2795eb385
|
获取角色
|
2025-03-05 14:29:09 +08:00 |
|
gaowdong
|
9eb79aeddf
|
合并代码
|
2025-03-05 14:10:09 +08:00 |
|
gaowdong
|
163d36c965
|
Merge remote-tracking branch 'origin/master' into dgw
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/alloc/model/AllocMetadata.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocCanteenApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/controller/AllocCanteenController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/controller/AllocMealtimeController.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/param/AllocCanteenStallPageParam.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/param/AllocCanteenStallParam.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocMealLineServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/util/MetadataUtil.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/api/DeviceV2Api.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/dto/DeviceTypeDto.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/mapper/DeviceInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/manage/service/DeviceInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/constant/MenuBindTypeEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/constant/MenuRecipeSortEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuAppRecipeMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/MenuRecipeBindSortService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeBindSortServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/merchant/api/MercMerchantApi.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/manage/DeviceInfoMapper.xml
|
2025-03-05 13:52:28 +08:00 |
|
gaowdong
|
5d01aac67c
|
双屏消费机
|
2025-03-05 13:06:43 +08:00 |
|
sxu
|
b594133df9
|
Merge branch 'ah-sbd-h5'
|
2025-03-05 12:49:51 +08:00 |
|
sxu
|
effd4fc22a
|
分页查询组织架构
|
2025-03-05 12:49:23 +08:00 |