 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 |
|
sxu
|
a8710891bf
|
sql增加tenant_id
|
2025-03-06 17:35:12 +08:00 |
|
gaowdong
|
f772514283
|
线上线下消费
|
2025-03-06 17:12:12 +08:00 |
|
sxu
|
7329929d19
|
sql增加tenant_id
|
2025-03-05 17:24:00 +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
|
6902ace558
|
Merge remote-tracking branch 'origin/master' into dgw
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/autth/api/MgrAuthApi.java
|
2025-03-05 14:15:48 +08:00 |
|
gaowdong
|
9eb79aeddf
|
合并代码
|
2025-03-05 14:10:09 +08:00 |
|
sxu
|
c73e71111d
|
获取角色
|
2025-03-05 14:06:46 +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 |
|
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
|
524bc76019
|
后台-lsh_餐次时段控制器
|
2025-03-05 09:58:39 +08:00 |
|
tqzhang
|
46af1f9e09
|
后台-分页查询餐线列表
|
2025-03-05 09:42:40 +08:00 |
|
tqzhang
|
e3cbbe4a16
|
后台-类型排序
|
2025-03-05 09:34:31 +08:00 |
|
sxu
|
bdf5485a89
|
Merge branch 'ah-sbd-h5'
|
2025-03-04 18:30:25 +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 |
|
sxu
|
558b5534bc
|
查询人员列表添加条件
|
2025-03-04 18:12:39 +08:00 |
|
gaowdong
|
47f40c566c
|
区域/档口管理
|
2025-03-04 17:35:45 +08:00 |
|
gaowdong
|
cd763b4567
|
区域/档口管理
|
2025-03-04 17:26:02 +08:00 |
|
gaowdong
|
c919fdd4f7
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Houqin into dgw
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocAreaMapper.java
|
2025-03-04 17:24:12 +08:00 |
|
gaowdong
|
e70bd4511d
|
区域/档口管理
|
2025-03-04 17:22:57 +08:00 |
|
tqzhang
|
f9a1385933
|
后台-pfy_菜品类型信息管理
|
2025-03-04 14:46:29 +08:00 |
|
tqzhang
|
5339d3da57
|
后台-pfy_菜品类型信息管理
|
2025-03-04 14:46:00 +08:00 |