Commit Graph

381 Commits

Author SHA1 Message Date
jjLv 3cb9a5023e Merge remote-tracking branch 'origin/master' 2025-05-12 09:28:29 +08:00
jjLv 45c5a2b45a 上传apk优化 2025-05-12 09:26:47 +08:00
liux e718e38865 前后端调试及问题修复 2025-05-09 18:05:42 +08:00
jjLv 2459915ed9 上传apk 2025-05-09 17:46:23 +08:00
sxu 0b12332114 删除地址 2025-05-09 17:30:58 +08:00
sxu 009e060d0b 设置默认地址 2025-05-09 16:40:49 +08:00
gaowdong 3a799fd7c1 Merge remote-tracking branch 'origin/master' 2025-05-09 14:06:17 +08:00
gaowdong 906dda1d69 5978 补贴明细的补贴清空明细中出现个人钱包的清空数据(个人钱包中点击钱包清空按钮) 2025-05-09 14:06:10 +08:00
sxu 3cb35b9b78 bug 5934 2025-05-09 13:42:11 +08:00
gaowdong a5d766d8e8 修复订单查询五餐次信息问题 2025-05-09 13:31:28 +08:00
gaowdong 7decccceab 账户消费记录查询 2025-05-09 10:36:46 +08:00
sxu 981348b579 菜品收藏 2025-05-09 10:30:40 +08:00
sxu c569df915f 一周菜谱 2025-05-09 10:23:39 +08:00
sxu 7c36b0e12a 删除菜品收藏 2025-05-09 09:55:38 +08:00
sxu ea74665d9f 卡列表 2025-05-09 09:32:58 +08:00
sxu 408aeeaf16 Merge remote-tracking branch 'origin/master' 2025-05-08 20:26:44 +08:00
sxu 1a6859b680 食堂评价回显问题 2025-05-08 20:26:36 +08:00
liux 4008305517 bug修复 2025-05-08 17:24:44 +08:00
gaowdong 164cf9b4c9 5847 个人补贴模块,批量补贴后补贴预览数据未展示 2025-05-08 16:53:48 +08:00
jjLv 402c5f2e1b 设备管理问题修改 2025-05-08 15:43:56 +08:00
liux 7b32e20de7 bug修复和新功能 2025-05-08 15:15:33 +08:00
liux 62adfb923a Merge remote-tracking branch 'origin/master' 2025-05-08 15:14:27 +08:00
sxu 980fbe39ea 订单评价回显问题 2025-05-08 14:25:14 +08:00
sxu b25009c986 投诉图片回显 2025-05-08 11:16:31 +08:00
jjLv 5972d6c7b9 Merge remote-tracking branch 'origin/master' 2025-05-08 10:48:20 +08:00
jjLv 38bd7bedf3 双屏消费机菜品接口加入限购数量等值 2025-05-08 10:48:09 +08:00
gaowdong e6137a1fdc 设备订单支付失败不保存订单 2025-05-08 09:56:44 +08:00
gaowdong 63a5e4ee66 H5订单提交后跳转 2025-05-08 09:20:41 +08:00
gaowdong 3ae2dd7544 5901 交易流水模块数据建议按照时间倒序展示 2025-05-07 17:01:07 +08:00
gaowdong ebb4d734c5 账户消费记录及超市订单列表 2025-05-07 16:49:17 +08:00
gaowdong 44863a71d5 人员收支汇总 2025-05-07 14:19:43 +08:00
gaowdong 03322a3ffc 5912 H5预订餐中休息的档口也能下单 2025-05-07 13:46:09 +08:00
sxu 581845ce98 bug 5902 2025-05-07 13:04:46 +08:00
sxu 440ff09a8b bug 5902 2025-05-07 12:24:52 +08:00
sxu c6b930ffbe bug 5908 2025-05-07 12:07:18 +08:00
sxu 438bf952bf Merge remote-tracking branch 'origin/master' 2025-05-07 11:33:14 +08:00
sxu 6af64d586b bug 5911 2025-05-07 11:32:51 +08:00
gaowdong ac88443367 Merge remote-tracking branch 'origin/master' 2025-05-07 11:29:55 +08:00
gaowdong 535c92764b 线上线下订单 2025-05-07 11:29:40 +08:00
sxu f4402c8d34 Merge remote-tracking branch 'origin/master' 2025-05-07 11:11:01 +08:00
sxu 858e09c198 新增地址错误 2025-05-07 11:10:57 +08:00
gaowdong f7778e64e8 线上线下订单 2025-05-07 10:50:44 +08:00
gaowdong 046f6250a5 消费退款记录修改 2025-05-07 09:39:40 +08:00
sxu cff5de17f3 Merge remote-tracking branch 'origin/master' 2025-05-07 09:00:50 +08:00
sxu 23172bb8ba bug 5801 2025-05-07 09:00:45 +08:00
gaowdong fd0ef49b62 报表统计错误修复 2025-05-06 15:19:11 +08:00
liux 7dd5e6d91d Merge remote-tracking branch 'origin/master' 2025-05-06 14:07:54 +08:00
gaowdong 4ac2f8bfcc 设备订单防止重复提交 2025-05-06 13:29:23 +08:00
sxu 7f7068e782 卡片管理 2025-05-06 09:09:06 +08:00
sxu 7be40de7c4 订单评价 2025-05-06 08:28:35 +08:00
sxu 999c07938c 订单评价 2025-05-05 12:53:35 +08:00
sxu 057d0da2fa 订单评价 2025-05-05 12:52:02 +08:00
sxu ff60ccd255 订单评价 2025-05-05 12:43:27 +08:00
sxu 7e1e9795e6 bug 5841 2025-05-05 11:50:55 +08:00
sxu b96f1e0098 bug 5841 2025-05-05 11:47:09 +08:00
sxu 8322745260 区域含食堂不能删 2025-05-05 11:32:05 +08:00
sxu 4873c9107b 食堂含档口不能删 2025-05-05 11:22:18 +08:00
jjLv 1050a759d4 双屏消费机参数配置修改、查询接口 2025-04-30 17:17:54 +08:00
liux 796a91fa5d h5历史菜谱功能薪增 2025-04-30 14:08:11 +08:00
gaowdong 5d1ca83851 增减钱包余额保护 2025-04-30 09:34:54 +08:00
gaowdong 96b57d76ae bug 2025-04-29 15:34:29 +08:00
liux 7df00e5adc Merge remote-tracking branch 'origin/master' 2025-04-29 14:34:15 +08:00
liux 1895152fd4 bug修复 2025-04-29 14:33:59 +08:00
gaowdong 44ac8ecb88 bug 2025-04-29 14:32:58 +08:00
sxu 36556300a4 Merge remote-tracking branch 'origin/master' 2025-04-29 11:07:32 +08:00
sxu be09234259 bug 5801 2025-04-29 11:07:29 +08:00
sxu 75c74bedcb bug 5806 2025-04-29 11:02:22 +08:00
gaowdong 4ad58496a8 bug 2025-04-29 10:59:20 +08:00
gaowdong 9f12744678 bug 2025-04-29 10:22:35 +08:00
sxu 466f2454e8 bug 5801 2025-04-29 10:21:00 +08:00
sxu 94daf19822 Merge remote-tracking branch 'origin/master' 2025-04-29 10:09:00 +08:00
sxu 3a160c97f8 bug 5803 2025-04-29 10:08:56 +08:00
gaowdong 1c45e9862a Merge remote-tracking branch 'origin/master' 2025-04-29 09:55:00 +08:00
gaowdong 3bb59100df 5854 2025-04-29 09:54:46 +08:00
jjLv 3f4ed89707 Merge remote-tracking branch 'origin/master' 2025-04-29 09:49:03 +08:00
jjLv 059bd787c7 人员修改 2025-04-29 09:48:53 +08:00
sxu faf6075b08 Merge remote-tracking branch 'origin/master' 2025-04-29 09:48:01 +08:00
sxu 76db58bf06 bug 5803 2025-04-29 09:47:57 +08:00
gaowdong a17b94f142 Merge remote-tracking branch 'origin/master' 2025-04-29 09:41:34 +08:00
gaowdong 768e3eca51 bug 修复 2025-04-29 09:41:20 +08:00
jjLv ad7fe392f1 设备管理修改 2025-04-29 09:27:24 +08:00
gaowdong 253f49b998 判断账户状态-是否删除 2025-04-29 09:19:01 +08:00
gaowdong 2ea8acf019 订单-核销 2025-04-28 16:01:30 +08:00
gaowdong d846f0160b 账户 过滤 已经删除用户 2025-04-28 15:14:54 +08:00
gaowdong f9e92a27f3 订单-用户 2025-04-28 14:59:53 +08:00
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