Commit Graph

900 Commits

Author SHA1 Message Date
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
gyq e9b60e238d Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-12-02 11:36:51 +08:00
gyq 1be956da85 更改添加商品定时上下架默认时间 2024-12-02 11:36:44 +08:00
YeMingfei666 1ec393fcf5 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-12-02 09:35:57 +08:00
YeMingfei666 42b61fbfa1 增加抖音美团核销 2024-12-02 09:35:07 +08:00
duan 8e1991e1bf Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-29 16:35:13 +08:00
duan aa54684e44 同步数据 2024-11-29 16:34:48 +08:00
YeMingfei666 80d211ced7 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-29 14:12:36 +08:00
YeMingfei666 8baaf8ff94 增加扫码验券接口 2024-11-29 14:12:32 +08:00
GaoHao c5fad9298c Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-29 10:54:49 +08:00
YeMingfei666 fe0eafbbb3 Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-29 09:58:46 +08:00
YeMingfei666 0768355644 限制订单先付费禁止退菜 2024-11-29 09:58:22 +08:00
YeMingfei666 5e1d80ce0f Merge branch 'ymf_test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-28 18:27:31 +08:00
YeMingfei666 f663db95f3 代客下单增加限制,当价格为0时禁止挂账,增加临时菜展示 2024-11-28 18:26:53 +08:00
YeMingfei666 1ada98907c 代码合并 2024-11-28 17:52:04 +08:00
YeMingfei666 45eaccb9ac 代客下单增加单品改价,挂账,等叫,免厨打等功能 2024-11-28 17:50:27 +08:00
魏啾 d101cd763b Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-28 14:28:00 +08:00
魏啾 b5cd694baf 删除操作记录IP展示 供应商出入库记录修改 2024-11-28 14:04:43 +08:00
GaoHao 41fa2e0c22 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-11-27 16:00:00 +08:00
GaoHao beb9ac4d28 挂账手机号限制更新 2024-11-27 15:59:44 +08:00
GaoHao 14365be0dd Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-27 15:38:53 +08:00
GaoHao 985a3c6ad6 分页数量修改 2024-11-27 15:38:30 +08:00
YeMingfei666 b0868703a5 代码合并,代客下单增加挂账支付 2024-11-27 15:07:40 +08:00
YeMingfei666 74bd8904ac 代码合并,增肌挂账人支付 2024-11-27 15:06:42 +08:00
GaoHao b06afa15fe Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-27 14:14:41 +08:00
GaoHao bd0b9311fd 筛选条件调试 2024-11-27 14:14:16 +08:00
GaoHao 971cdd8f36 挂账记录重置更新 2024-11-27 14:01:58 +08:00
GaoHao 9465d660ad 环境更新 2024-11-27 13:28:41 +08:00
GaoHao c3c47ff647 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-27 11:36:48 +08:00
GaoHao e62ff19b5f 挂账增加防抖 2024-11-27 11:35:33 +08:00
YeMingfei666 c4f9bdfb8a Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test 2024-11-27 09:01:26 +08:00
魏啾 4218084ebf 冲突 2024-11-26 11:02:34 +08:00
魏啾 feea4c04a6 Merge branch 'wwzdiv' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-11-26 10:59:01 +08:00
魏啾 dc0b2f7605 耗材盘点 2024-11-26 10:05:34 +08:00
魏啾 56c47a1ab2 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwzdiv 2024-11-26 09:36:27 +08:00
duan 79abd9c10d Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-25 17:55:12 +08:00
duan cdc02f1ff4 打印机开票 2024-11-25 17:54:34 +08:00
GaoHao dc79da043f Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-25 17:27:33 +08:00
gyq 8cf46745cd 优化pad点单设置 2024-11-25 16:51:06 +08:00
YeMingfei666 63349360fa 增加单品改价 2024-11-25 16:31:36 +08:00
GaoHao 952574e92d 挂账添加 2024-11-25 16:26:28 +08:00