Commit Graph

797 Commits

Author SHA1 Message Date
YeMingfei666 c224469c35 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-10-17 13:41:50 +08:00
GaoHao 489baa80d8 员工权限校验 2024-10-17 11:46:00 +08:00
YeMingfei666 eee6b3c9fa 增加无可用台桌时的提示 2024-10-17 11:39:10 +08:00
GaoHao 2c54a2a1d1 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-10-17 11:35:33 +08:00
GaoHao c75ff0ee68 员工权限校验 2024-10-17 11:35:03 +08:00
魏啾 585c26fd4d Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 11:32:19 +08:00
魏啾 904c6be6ba 商品修改 耗材修改 2024-10-17 11:31:04 +08:00
duan 90573dac96 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 10:11:15 +08:00
duan c625d9a886 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 10:11:13 +08:00
duan 21197e6258 打印机本地或网络判断 2024-10-17 10:11:00 +08:00
gyq b2a3854f2b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-17 09:05:24 +08:00
gyq 9cf170e289 优化面包屑首页跳转失败 2024-10-17 09:04:51 +08:00
duan fa28b9d8ac Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-16 18:01:11 +08:00
duan 866c395558 打印机 2024-10-16 18:00:46 +08:00
魏啾 d3bfab8010 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-16 10:40:47 +08:00
魏啾 0c289d21a4 修改出库"in" 2024-10-16 10:05:11 +08:00
duan 9f2af5cf76 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-16 09:52:41 +08:00
duan b9709d9fd4 打印机第5次修改 2024-10-16 09:52:32 +08:00
YeMingfei666 411b434b26 代客下单将之前的打包赠送等接口从添加改为更新 2024-10-15 17:19:18 +08:00
魏啾 c5816b1d85 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-15 16:40:35 +08:00
魏啾 b3ea406b6e detail.createdAt | paidTime | timeFilter报错 2024-10-15 16:40:15 +08:00
魏啾 2acc46e811 耗材出库入库参数修改 2024-10-15 16:20:17 +08:00
gyq 9513f7a3ec 优化 2024-10-15 15:42:58 +08:00
gyq acf055ee72 修复耗材绑定有限打开多规格后单规格样式错乱问题 2024-10-15 15:27:32 +08:00
gyq a3e6c066a3 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-15 09:21:43 +08:00
gyq b391a7da80 修复样式污染 2024-10-15 09:16:07 +08:00
duan e1a8f59bbf Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-15 09:10:29 +08:00
duan 0069fb7185 打印机第4次修改 2024-10-15 09:09:42 +08:00
gyq 9e269a690c Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-15 09:03:06 +08:00
gyq ef53332726 优化规格绑定耗材样式 2024-10-15 09:02:39 +08:00
魏啾 2b6a4f9a83 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-14 14:49:03 +08:00
魏啾 f1a599881c 耗材列表 2024-10-14 14:48:51 +08:00
YeMingfei666 3ebbfb6324 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 15:55:35 +08:00
YeMingfei666 2c7042e6e2 修复代客下单扫码支付金额不对 2024-10-12 15:53:29 +08:00
魏啾 f623106dce Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 14:48:26 +08:00
魏啾 327e8ef17c 订单编号点击跳转 2024-10-12 14:47:54 +08:00
YeMingfei666 0e7f5885e0 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 13:59:46 +08:00
YeMingfei666 79e27f0098 代客下单修改
先付费模式下只要生成订单就清空购物车
2024-10-12 13:59:16 +08:00
魏啾 fec143eb44 操作类型 2024-10-12 13:46:44 +08:00
魏啾 893ec1bec4 耗材修改 2024-10-12 11:00:50 +08:00
duan 49a458de76 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-12 10:44:06 +08:00
duan 8f7aaf87d5 打印机部分修改优化 2024-10-12 10:43:56 +08:00
gyq 9c561ff725 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 10:37:15 +08:00
gyq 5608d7569b 优化商品列表首页统计 2024-10-12 10:37:05 +08:00
魏啾 9d42cda990 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-12 10:08:40 +08:00
魏啾 7bad259789 耗材 2024-10-12 10:08:27 +08:00
gyq 7a065c64cc Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 09:48:10 +08:00
gyq a21199d217 优化商品列表 2024-10-12 09:47:58 +08:00
YeMingfei666 23782f0f82 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 17:22:12 +08:00
YeMingfei666 9785038621 修复代课下单用户扫码支付后未清除定时器 2024-10-11 17:21:44 +08:00