Commit Graph

344 Commits

Author SHA1 Message Date
sxu b0ce1ed9e4 bug 6338 2025-06-16 17:05:42 +08:00
sxu 1d1119c5de bug 6345 2025-06-16 16:57:14 +08:00
skjia fecac82f1f Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-06-16 12:48:08 +08:00
skjia 01d36011f6 jsk 2025-06-16 12:47:56 +08:00
sxu 80dc2573a3 Merge remote-tracking branch 'origin/master' 2025-06-16 11:25:46 +08:00
sxu c87b610bb9 设置的批量修改和恢复 2025-06-16 11:25:32 +08:00
skjia d3bd419a3f jsk 健康管理 2025-06-16 10:19:36 +08:00
gaowdong 282f9bb0f3 部分退单增加库存 2025-06-13 18:08:50 +08:00
jjLv e5bb96d186 菜品校验查询类别默认不查parent=0的值 2025-06-13 16:56:39 +08:00
skjia aec860dacf jsk BUG修正 2025-06-13 15:06:57 +08:00
skjia 57cb2301b7 jsk BUG问题修正 2025-06-13 13:26:35 +08:00
gaowdong 7284465c60 部分退单加日志 2025-06-13 10:16:29 +08:00
gaowdong 71629f9a7f 退单提醒优化 2025-06-13 09:38:40 +08:00
gaowdong a6afd8b397 钱包操作记录查询增加字段 2025-06-12 15:57:26 +08:00
gaowdong eb01a2a6cb Merge remote-tracking branch 'origin/master' 2025-06-12 15:26:33 +08:00
gaowdong b1c2310c16 钱包操作记录查询增加字段 2025-06-12 15:26:05 +08:00
jjLv 4c78b3d5d9 营养信息添加字段 2025-06-12 15:24:23 +08:00
gaowdong 0c0be94e1e Merge remote-tracking branch 'origin/master' 2025-06-12 14:48:14 +08:00
gaowdong e3450235b2 钱包操作记录查询支付成功的 2025-06-12 14:47:59 +08:00
jjLv e6c6757693 营养信息添加字段 2025-06-12 14:45:27 +08:00
sxu 4317612f86 Merge remote-tracking branch 'origin/master' 2025-06-12 11:29:16 +08:00
sxu f1bc130dac device type 2025-06-12 11:28:54 +08:00
gaowdong 7ade0be51f 设备订单状态下单后改为已完成(需求来自shengxu) 2025-06-12 10:39:37 +08:00
gaowdong 20dd2005d3 订单增加配送方式参数 2025-06-11 16:06:55 +08:00
gaowdong 329fe7ff35 6264 用户下单时间和退款时间一样,但实际操作时,下单是一个时间,退款是另一个时间 2025-06-11 14:41:17 +08:00
gaowdong 65d1ebf741 6245 账户退卡后账户管理中依然显示已退卡号,且重新发卡后会多出一条新卡号数据 2025-06-11 14:07:58 +08:00
sxu 5888a21f1a bug 6276 2025-06-11 12:14:36 +08:00
sxu eee8828ae2 h5菜谱显示不全的问题 2025-06-11 12:01:44 +08:00
sxu 9f88c9f7ff Merge remote-tracking branch 'origin/master' 2025-06-11 11:18:01 +08:00
sxu 50a9a56452 bug 6273 2025-06-11 11:15:54 +08:00
gaowdong 4af9fe0bdc 6288 交易流水充值后消费,账户余额显示不对 2025-06-11 09:27:40 +08:00
sxu a466bab26d 有商品不能删除超市 2025-06-11 09:19:29 +08:00
sxu f073dbfee7 fix bug 6239 2025-06-10 21:10:07 +08:00
sxu b681da09bf fix bug 6236 2025-06-10 20:59:17 +08:00
sxu c870cd87bc fix bug 6234 2025-06-10 20:09:41 +08:00
sxu aa035e3208 fix bug 6233 2025-06-10 20:00:54 +08:00
jjLv b71047cc11 营养信息添加食材编码校验 2025-06-10 18:24:10 +08:00
gaowdong 60435f52a2 6241 钱包管理提现时提现金额输入过大时系统提示不友好建议优化 2025-06-10 18:07:40 +08:00
gaowdong ff2384bf6f 订单备注 2025-06-10 17:26:20 +08:00
gaowdong 753c74d8a6 6243 批量补贴和批量清空补贴时人员的所属组织不回显 2025-06-10 16:59:07 +08:00
gaowdong e32a7d6cfb 订单管理-退单 2025-06-10 14:39:38 +08:00
gaowdong 3965503f89 订单管理-退单 2025-06-10 14:00:44 +08:00
gaowdong c30fe148de 订单管理-退单 2025-06-09 17:21:52 +08:00
skjia d4357b9949 jsk 2025-06-09 15:57:19 +08:00
sxu 3fe1cb6e88 删除多余代码 2025-06-09 14:45:21 +08:00
sxu 5020e2fd50 Merge remote-tracking branch 'origin/master' 2025-06-09 13:52:11 +08:00
sxu df3cc9e90c recipe detail id 2025-06-09 13:51:44 +08:00
skjia 874814822f Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-06-09 13:27:19 +08:00
skjia c8b0e17366 jsk 2025-06-09 13:26:56 +08:00
gaowdong 02d617667c Merge branch 'master' into report 2025-06-09 10:15:42 +08:00