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
|
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
|
c4c677a08f
|
fix conflict
|
2025-03-13 11:19:02 +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
|
f00653630b
|
healthbody
|
2025-03-12 21:52:11 +08:00 |
|
sxu
|
3a8c9344c7
|
healthbody
|
2025-03-12 20:26:59 +08:00 |
|
gaowdong
|
2e272af445
|
替换 cust_org 表为 sys_dept
|
2025-03-12 16:22:41 +08:00 |
|
gaowdong
|
a14351ff63
|
设备端-支付/订单/菜谱
|
2025-03-11 15:20:47 +08:00 |
|
sxu
|
3bab462b7c
|
集团版--权限区域食堂档口树
|
2025-03-11 13:38:24 +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 |
|
gaowdong
|
a4ed486695
|
超市订单
|
2025-03-10 13:04:12 +08:00 |
|
gaowdong
|
db302ee97b
|
超市订单
|
2025-03-10 10:33:45 +08:00 |
|
sxu
|
175f339a53
|
添加uptime
|
2025-03-07 18:21:27 +08:00 |
|
jjLv
|
2b01a92d34
|
食堂：pfy_菜品灶类信息管理、gyp_菜品功效控制器、pfy_菜品导入失败记录、pfy_菜品标签基础信息管理、gyp_菜系控制器、gyp_适宜人群控制器、pfy_菜品口味信息管理
|
2025-03-07 13:59:18 +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 |
|
gaowdong
|
4ac8211277
|
获取指定日期菜谱计划菜品详情
|
2025-03-05 14:43:26 +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
|
7683cd39c7
|
后台-菜谱计划发布v2
|
2025-03-05 14:30:12 +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
|
19cf944022
|
Merge branch 'ah-sbd-h5'
|
2025-03-05 10:30:49 +08:00 |
|
sxu
|
c3974f79b0
|
分页查询组织架构
|
2025-03-05 10:23:25 +08:00 |
|
sxu
|
ade57fd7eb
|
Revert "分页查询组织架构"
This reverts commit 675c91c4aa.
|
2025-03-05 10:18:39 +08:00 |
|
sxu
|
b6ebd03144
|
Merge remote-tracking branch 'origin/master'
|
2025-03-05 10:13:54 +08:00 |
|
sxu
|
675c91c4aa
|
分页查询组织架构
|
2025-03-05 10:13:43 +08:00 |
|
tqzhang
|
46af1f9e09
|
后台-分页查询餐线列表
|
2025-03-05 09:42:40 +08:00 |
|
tqzhang
|
e3cbbe4a16
|
后台-类型排序
|
2025-03-05 09:34:31 +08:00 |
|
sxu
|
1c1c4b9b59
|
修复typeHandler错误
|
2025-03-04 18:28:52 +08:00 |
|
sxu
|
6b74547f81
|
Merge remote-tracking branch 'origin/master'
|
2025-03-04 18:15:47 +08:00 |
|
tqzhang
|
fb9c43b3f3
|
后台-pfy_新增菜品信息v2等
|
2025-03-04 18:15:08 +08:00 |