Commit Graph

403 Commits

Author SHA1 Message Date
gaowdong 5e38ad18dd 订单核销 2025-04-28 14:24:55 +08:00
jjLv 38f6c4acff 用户信息加入nickName 2025-04-28 10:58:46 +08:00
gaowdong bf96ef67b0 订单 2025-04-28 10:56:44 +08:00
gaowdong 7a4f4062bc Merge remote-tracking branch 'origin/master' 2025-04-28 10:32:40 +08:00
gaowdong 81f77eda76 订单 2025-04-28 10:32:33 +08:00
liux a107b2b170 菜谱问题修复 2025-04-28 09:22:11 +08:00
sxu 9b2045952e 收藏问题 2025-04-28 06:13:34 +08:00
sxu 52c8593ca1 收藏问题 2025-04-27 18:32:13 +08:00
sxu 08179ce4c3 区域树 2025-04-27 18:03:17 +08:00
sxu d5d9fd4132 Merge remote-tracking branch 'origin/master' 2025-04-27 17:54:05 +08:00
sxu ef43aef4af 菜品dishesId 2025-04-27 17:54:02 +08:00
jjLv 7f3210b7ed 消费机自动更新 2025-04-27 15:17:09 +08:00
jjLv 3212a16544 用户更改 2025-04-27 10:35:38 +08:00
sxu d486c7a194 Merge remote-tracking branch 'origin/master' 2025-04-27 08:56:43 +08:00
sxu 9493284019 菜品评价 2025-04-26 16:15:46 +08:00
sxu 15dffba36b 菜品评价 2025-04-26 15:36:41 +08:00
sxu 091e6cc46b 菜品收藏优化 2025-04-26 15:02:30 +08:00
sxu c53ef6bbbe 卡片用户昵称 2025-04-26 14:27:39 +08:00
sxu ed916c4d76 卡片用户昵称 2025-04-26 14:22:53 +08:00
jjLv 4cb02390ed 用户更改 2025-04-25 17:33:23 +08:00
gaowdong 309ee07859 订单 2025-04-25 09:07:37 +08:00
gaowdong d96ce38b1c 报表 2025-04-24 14:39:59 +08:00
gaowdong a293017a3b 报表 2025-04-24 14:27:45 +08:00
gaowdong 6de80d4ab1 Merge remote-tracking branch 'origin/master' 2025-04-24 13:53:33 +08:00
gaowdong b8060c39c7 订单提交 2025-04-24 13:53:01 +08:00
jjLv bf4918a7cb 双屏机 2025-04-24 13:28:57 +08:00
sxu 22537257f5 Merge remote-tracking branch 'origin/master' 2025-04-24 13:15:44 +08:00
sxu c451cf8045 订单菜谱评价 2025-04-24 13:15:37 +08:00
gaowdong 0a5d34f2a7 Merge remote-tracking branch 'origin/master' 2025-04-24 13:09:22 +08:00
gaowdong 1e72dd1545 报表 2025-04-24 13:09:15 +08:00
sxu c2c1ee45f7 Merge remote-tracking branch 'origin/master' 2025-04-24 12:12:10 +08:00
sxu 24aa5196ce 卡片管理 2025-04-24 12:12:08 +08:00
gaowdong e998808551 查询修改 2025-04-24 11:04:26 +08:00
gaowdong 8e52b85a55 查询修改 2025-04-24 10:30:58 +08:00
sxu 8365a5fa84 卡片管理 2025-04-24 09:52:55 +08:00
skjia ec75df799b jsk 商超 2025-04-23 22:37:03 +08:00
sxu 64872c4ee8 Merge remote-tracking branch 'origin/master' 2025-04-23 19:22:44 +08:00
sxu e377e61833 卡片管理 2025-04-23 19:22:36 +08:00
sxu 7e9c899e91 卡片管理 2025-04-23 18:22:31 +08:00
gaowdong 4c0affefce 消费汇总 2025-04-23 18:18:41 +08:00
sxu c97abd5024 卡片管理 2025-04-23 18:00:33 +08:00
sxu 8cc276ae19 卡片管理 2025-04-23 17:30:00 +08:00
sxu 25e8e7a67e 卡片管理 2025-04-23 16:42:03 +08:00
sxu 1bc3bcd67a 卡片管理 2025-04-23 12:25:55 +08:00
sxu 003cb3b943 人脸 2025-04-23 10:33:47 +08:00
sxu 56c277293e 人脸 2025-04-23 09:53:33 +08:00
sxu 87f66ad049 Merge remote-tracking branch 'origin/master' 2025-04-23 09:50:01 +08:00
sxu 8b39a21fab 人脸 2025-04-23 09:49:52 +08:00
jjLv 37a7b40e2f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuRecipeMapper.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java
#	bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml
2025-04-23 09:40:12 +08:00
jjLv 953f9d7bd8 双屏机 2025-04-23 09:37:24 +08:00