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 |
|
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
|
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 |
|
tqzhang
|
a34a540dad
|
后台-证书库查询
|
2025-03-04 14:13:10 +08:00 |
|
tqzhang
|
d70a9ba22c
|
后台-pfy_库存原料类别
|
2025-03-04 13:44:37 +08:00 |
|
tqzhang
|
b9cf66a178
|
后台-gyp_计量单位管理
|
2025-03-04 11:19:47 +08:00 |
|
tqzhang
|
c6cf0580f7
|
后台-gyp_商家食材原料信息管理
|
2025-03-04 11:05:09 +08:00 |
|
gaowdong
|
eac739145d
|
Merge remote-tracking branch 'origin/master' into dgw
|
2025-03-04 09:21:30 +08:00 |
|
gaowdong
|
d99b6f5735
|
档口管理
|
2025-03-04 09:21:12 +08:00 |
|
sxu
|
5c261cecf9
|
CipherQueryLikeHandler
|
2025-03-03 18:48:51 +08:00 |
|
sxu
|
9859691596
|
SM4EncDecHandler
|
2025-03-03 18:47:32 +08:00 |
|
sxu
|
c85d67f632
|
人员类别控制层
|
2025-03-03 18:28:46 +08:00 |
|
sxu
|
58c6720f60
|
人员类别控制层
|
2025-03-03 18:02:28 +08:00 |
|
gaowdong
|
01cca8b068
|
食堂管理 （增删改查）
|
2025-03-03 16:17:25 +08:00 |
|
tqzhang
|
ba50643942
|
后台-营养信息模块
|
2025-03-03 15:51:16 +08:00 |
|
sxu
|
914500550d
|
人员类别控制层
|
2025-03-03 15:02:32 +08:00 |
|
gaowdong
|
519b64ff18
|
区域管理 （增删改查）
|
2025-03-03 11:00:41 +08:00 |
|
sxu
|
d61fac9987
|
Merge branch 'ah-sbd-h5'
|
2025-03-03 10:52:14 +08:00 |
|
sxu
|
d7fa8764e7
|
分页查询人员及生物识别特征
|
2025-03-03 10:51:36 +08:00 |
|
tqzhang
|
f7d21bb0ea
|
驿站：绿植服务内容
|
2025-03-03 09:28:57 +08:00 |
|
sxu
|
10ec8d54f7
|
配置文件
|
2025-03-01 10:50:23 +08:00 |
|
sxu
|
3d87769781
|
分页查询人员及生物识别特征
|
2025-03-01 10:33:24 +08:00 |
|
sxu
|
c4dff7ed37
|
分页查询人员及生物识别特征
|
2025-03-01 10:29:09 +08:00 |
|
sxu
|
9d7d107288
|
分页查询人员及生物识别特征
|
2025-03-01 10:25:24 +08:00 |
|
sxu
|
be78a0589b
|
fix ClassCastException
|
2025-03-01 10:13:22 +08:00 |
|
sxu
|
c164464e89
|
fix ClassCastException
|
2025-03-01 10:07:46 +08:00 |
|
sxu
|
c43b0e9597
|
系统区域权限树
|
2025-02-28 16:50:53 +08:00 |
|
sxu
|
34f2bc250c
|
fix bug
|
2025-02-28 15:30:09 +08:00 |
|
sxu
|
771a34bdde
|
更换报名
|
2025-02-27 17:31:27 +08:00 |
|
sxu
|
eddd948b2b
|
更换路径
|
2025-02-27 16:35:17 +08:00 |