Commit Graph

903 Commits

Author SHA1 Message Date
wwz 7b0c291492 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-23 09:41:57 +08:00
wwz f62b1fde5d Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-12-19 14:47:09 +08:00
wwz b69a95c92c 赠送管理 2024-12-19 14:45:37 +08:00
wwz b566eaf516 台桌费 2024-12-18 11:22:14 +08:00
gyq d85c6db3f6 修复添加商品时间 2024-12-18 09:42:53 +08:00
gyq e959aba44d 修复添加商品时间 2024-12-18 09:41:10 +08:00
wwz 9f72777317 代客下单增加课座费 2024-12-17 10:29:00 +08:00
GaoHao 3828987560 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-16 16:52:42 +08:00
GaoHao 185749701b 桌台预约调试 2024-12-16 15:24:14 +08:00
魏啾 6be5fc0b07 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-12 11:25:17 +08:00
魏啾 98ae9c5e21 并桌转桌 2024-12-12 11:24:12 +08:00
GaoHao 316fce4cfc Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-12 11:03:10 +08:00
GaoHao bce36a4e16 升级版本相关修改,台桌增加预约 2024-12-12 11:02:27 +08:00
魏啾 535e3834c9 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-12-11 17:31:16 +08:00
魏啾 9782256a84 代课下单 2024-12-11 17:30:55 +08:00
魏啾 e0ef691797 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-10 18:30:32 +08:00
YeMingfei666 73a6736075 挂账金额禁止编辑 2024-12-10 18:30:00 +08:00
魏啾 c3ed239ee2 代课下单x2重复提交 2024-12-10 18:14:44 +08:00
魏啾 5f6c6d6635 代课下单套餐下单修改 2024-12-10 18:09:29 +08:00
魏啾 8b78d1c7ee 增加店铺账号到期提醒 2024-12-10 17:27:53 +08:00
魏啾 1bd0b0daa9 登录不请求php登录接口 2024-12-10 15:16:06 +08:00
魏啾 ac74254ed5 解决冲突 2024-12-10 11:49:34 +08:00
魏啾 25761ba734 代课下单 2024-12-10 11:36:32 +08:00
YeMingfei666 737c24ddad 修改支付完成清空选择券的列表 2024-12-09 10:40:41 +08:00
魏啾 f16d81d9bd 1 2024-12-07 18:29:43 +08:00
YeMingfei666 d4b746980a 取消选择优惠券后打折重置问题 2024-12-07 14:43:09 +08:00
魏啾 e05e7ee63f Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-06 18:03:45 +08:00
魏啾 a546fd3fb5 代课下单添加显示 2024-12-06 17:28:38 +08:00
duan 833c45e566 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-12-06 17:17:05 +08:00
duan 96cdf4fc16 打印机分类打印逻辑修改 2024-12-06 17:16:21 +08:00
YeMingfei666 a4f989605e Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-06 13:36:14 +08:00
YeMingfei666 276b42ea8b 修改计算公式 2024-12-06 13:35:27 +08:00
gyq ea93710b6e 优化称重起售数量 2024-12-06 10:42:00 +08:00
YeMingfei666 850509ba04 修复单品改价弹窗关闭未重置问题 2024-12-05 10:11:47 +08:00
YeMingfei666 4cf751a51c 修改共多少件展示结果小数位数过多问题 2024-12-05 09:32:30 +08:00
YeMingfei666 d3a829017f Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-05 09:07:07 +08:00
YeMingfei666 8c16d95ead 修改称重商品提交时只保留两位小数 2024-12-05 09:05:40 +08:00
YeMingfei666 5cbd9aa18e Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-04 17:16:00 +08:00
YeMingfei666 dbf34179e9 修复代客下单商品默认打印标签,修改下单或者支付后重置整单等叫状态 2024-12-04 17:15:37 +08:00
gyq 8fb55d0f03 优化套餐商品 2024-12-04 14:47:20 +08:00
gyq 5b0f00fa58 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-12-04 10:30:05 +08:00
gyq 182f9c4e2b 添加商品定时上下架默认全选 2024-12-04 10:29:54 +08:00
魏啾 7d5450acbc Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-03 16:13:55 +08:00
YeMingfei666 bfe0529036 代客下单新增称重商品 2024-12-03 15:03:05 +08:00
魏啾 4202509cf5 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-12-03 15:02:59 +08:00
魏啾 554b0d9bfa 更新出库跳转 2024-12-03 15:02:22 +08:00
duan 01a5c81235 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-03 11:18:01 +08:00
duan c5f4688432 代客下单计算器 2024-12-03 11:17:43 +08:00
魏啾 34f7bfac35 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-12-02 15:59:03 +08:00
魏啾 a3da940105 美团抖音核销 2024-12-02 15:58:31 +08:00