Commit Graph

857 Commits

Author SHA1 Message Date
魏啾 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
GaoHao 952574e92d 挂账添加 2024-11-25 16:26:28 +08:00
GaoHao d52a755338 挂账添加 2024-11-25 16:23:03 +08:00
魏啾 0cec66ef27 上次一样 2024-11-25 14:42:04 +08:00
魏啾 ba5c3714cf 更改订单->隐藏总金额列表 2024-11-25 14:41:04 +08:00
魏啾 4a62f56c96 影藏订单信息中总金额那个接口和列表 2024-11-25 14:35:42 +08:00
duan d9f97b6ddb 开票注释绑定 2024-11-25 14:25:18 +08:00
duan 0c2d22e1c3 开票 2024-11-25 14:23:53 +08:00
duan e0abb6a589 开票隐藏 2024-11-25 13:59:53 +08:00
duan 4b87e91199 开票 2024-11-25 13:53:57 +08:00
duan 61c63d71ce Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-25 10:59:32 +08:00
duan 161caeeabe 开票优化 2024-11-25 10:59:20 +08:00
gyq 22bec823b2 优化 2024-11-25 09:42:32 +08:00
gyq 468209308c Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq_11.19_dev 2024-11-25 09:41:36 +08:00
gyq 54f0a407c2 更改正式接口 2024-11-25 09:41:24 +08:00
YeMingfei666 94bf94b16a 修改优惠金额展示 2024-11-25 09:33:06 +08:00
YeMingfei666 62d775a668 代码合并 2024-11-23 18:13:23 +08:00
YeMingfei666 ae03b5b9f3 代码合并 2024-11-23 18:13:01 +08:00
GaoHao b9663206f3 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-11-23 18:07:18 +08:00
GaoHao 7e728e9df0 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-11-23 18:07:00 +08:00
GaoHao c623a510ef 挂账相关更新 2024-11-23 18:06:24 +08:00
YeMingfei666 56b9c1ebf7 代码合并 2024-11-23 17:58:53 +08:00
YeMingfei666 adfdee835b Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-11-23 17:52:04 +08:00
YeMingfei666 5076efee3a 修改订单详情金额展示 2024-11-23 17:44:21 +08:00
GaoHao fe4d54440e 优惠券相关更新 2024-11-23 10:03:22 +08:00
duan d704253591 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-22 16:52:37 +08:00
duan a7a9c42126 切换店铺 2024-11-22 16:52:24 +08:00
gyq 19aaea4559 优化添加店铺选择主账号 2024-11-22 15:36:05 +08:00
gyq f266501a7b 去除商品列表多规格操作编辑 2024-11-22 14:31:32 +08:00
魏啾 04efab005c Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-11-22 09:44:51 +08:00
魏啾 cf9a6d03ff 台桌预订短信 2024-11-22 09:43:57 +08:00
gyq 796fc49fb1 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-11-22 09:34:22 +08:00
gyq df9a29359f 新增商品增加套餐、称重 2024-11-22 09:34:14 +08:00
GaoHao 589483bbcc Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-11-21 16:56:59 +08:00
duan c94acd899a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-21 15:25:28 +08:00
duan 224552f546 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-21 15:25:10 +08:00
YeMingfei666 270c7350d3 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-11-21 15:24:52 +08:00
duan e8299f8d12 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-11-21 15:24:44 +08:00
YeMingfei666 862812caa3 修改商品券计算时增加打折比例 2024-11-21 15:24:31 +08:00
duan 25c030f2a2 营销中心-归档 基于当前dev分支修改 2024-11-21 15:23:30 +08:00
duan f7e4fd77aa 提交营销中心 2024-11-21 14:50:55 +08:00
duan 8cb0d99962 开票功能 2024-11-21 10:44:36 +08:00
duan f8130508a2 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-11-21 09:24:07 +08:00