Commit Graph

203 Commits

Author SHA1 Message Date
sxu 6dddd5f9e4 人脸 2025-04-23 09:12:47 +08:00
gaowdong 5811a145fd Merge remote-tracking branch 'origin/master' 2025-04-22 18:55:02 +08:00
gaowdong 4108a8be68 订单-验证 2025-04-22 18:54:56 +08:00
gaowdong ed8ded5420 订单-验证 2025-04-22 18:54:44 +08:00
gaowdong b78cd5ea59 Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Canteen 2025-04-22 18:27:42 +08:00
gaowdong 21ac614166 报表 2025-04-22 18:27:21 +08:00
liux 63d4951a3b 菜谱导入和菜谱定时任务 2025-04-22 18:02:01 +08:00
liux d90a34a220 菜品导入 2025-04-22 13:46:38 +08:00
gaowdong 7ec208c6d9 报表-交易流水 2025-04-21 16:59:40 +08:00
sxu ad1a3b605b Merge remote-tracking branch 'origin/master' 2025-04-21 16:18:21 +08:00
sxu d7314c40a5 评价管理 2025-04-21 16:12:38 +08:00
gaowdong 03e2fe84c0 交易记录修改 2025-04-21 15:13:21 +08:00
gaowdong 1e2ad095b5 个人取款 及记录查询 2025-04-21 14:04:23 +08:00
liux 06a083c91a 菜谱 2025-04-21 11:42:07 +08:00
liux 0fa9bb8baa 菜品查询、修改、删除 2025-04-21 11:20:05 +08:00
liux 8d6d145dff 菜品查询、修改、删除 2025-04-21 10:57:11 +08:00
gaowdong bfeb28a945 设备超市订单 2025-04-21 10:10:06 +08:00
sxu b6919b8fd2 健康信息 2025-04-20 20:26:58 +08:00
sxu ca9cdfd700 menu_* 2025-04-20 20:20:28 +08:00
sxu 1a74d4f6ec alloc_canteen_suggestion 2025-04-20 20:14:55 +08:00
sxu 04d98c266b acc_card 2025-04-20 20:12:51 +08:00
liux e4473d5c8a 菜品,菜谱,档口相关问题修复,接口编写,更新此版本 本地数据库需执行添加以下sql语句:
ALTER TABLE menu_dishes
ADD COLUMN label_id VARCHAR(32) COMMENT '标签id'  AFTER remark,
ADD COLUMN taste_id VARCHAR(32) COMMENT '口味id' AFTER label_id,
ADD COLUMN season_id VARCHAR(32) COMMENT '分类id' AFTER taste_id,
ADD COLUMN suit_id VARCHAR(32) COMMENT '适宜人群id' AFTER season_id,
ADD COLUMN meal_id VARCHAR(32) COMMENT '餐次id' AFTER suit_id;
2025-04-19 14:50:28 +08:00
jjLv 28782ce71c 双屏机 2025-04-18 20:06:41 +08:00
gaowdong 6691aee33b 设备订单 2025-04-18 18:14:00 +08:00
gaowdong 7d21959bbb Merge remote-tracking branch 'origin/master' 2025-04-18 18:04:27 +08:00
gaowdong 0640f63ed8 设备订单 2025-04-18 18:04:20 +08:00
sxu 9aaa39904c 预订餐菜品图片 fix 2025-04-18 17:57:59 +08:00
sxu 2c31f59d84 菜品添加及搜索 fix 2025-04-18 17:14:51 +08:00
sxu 610999008c Merge remote-tracking branch 'origin/master' 2025-04-18 16:35:44 +08:00
sxu 36e3c749bc 原料筛选 fix 2025-04-18 16:32:52 +08:00
gaowdong 144559884a Merge remote-tracking branch 'origin/master' 2025-04-18 16:22:57 +08:00
gaowdong db1cb776fc 设备订单支付方式 2025-04-18 16:22:50 +08:00
sxu 8109fd4291 menu_nutrition del_flag fix 2025-04-18 16:20:55 +08:00
sxu 35df8518b7 menu_dishes_type crby fix 2025-04-18 16:11:18 +08:00
sxu f010bf8fc3 menu_dishes_type crby fix 2025-04-18 16:10:05 +08:00
sxu dd813f12b2 menu_dishes_type crby fix 2025-04-18 16:06:23 +08:00
sxu 9fa938d839 menu_dishes_type crby fix 2025-04-18 16:05:55 +08:00
gaowdong bf2194c331 Merge remote-tracking branch 'origin/master' 2025-04-18 15:33:20 +08:00
gaowdong a4e4fc6e7f 订单 2025-04-18 15:33:14 +08:00
sxu b4c1cfbc6e menu_dishes menu_dishes_base crby fix 2025-04-18 15:31:14 +08:00
sxu 9a2a6db3a6 预订餐h5 2025-04-18 15:14:13 +08:00
sxu 3ba062c3d5 预订餐档口信息 2025-04-18 14:26:25 +08:00
sxu 008f4f6dd4 预订餐档口信息 2025-04-18 14:17:51 +08:00
sxu 2ea049b31e 删除菜品relation表 2025-04-18 13:14:23 +08:00
sxu 05d652a3c6 预订餐时间 2025-04-18 11:11:26 +08:00
liux 36651eafb5 营养修复 2025-04-18 10:06:08 +08:00
sxu c845f5f0ca Merge remote-tracking branch 'origin/master' 2025-04-18 10:04:57 +08:00
sxu c4210a8db9 编辑菜谱报错 2025-04-18 10:04:48 +08:00
gaowdong d09254f0bb 订单-支付 2025-04-18 09:55:33 +08:00
sxu a5256a3cf9 食堂档口管理员 2025-04-17 20:27:42 +08:00