Commit Graph

60 Commits

Author SHA1 Message Date
GaoHao c232d9ce76 添加绑定码牌 2024-10-24 17:36:28 +08:00
YeMingfei666 381187b2c1 合并代码 2024-10-24 15:47:06 +08:00
YeMingfei666 c19eb54d6d 增加缓存代客下单商品以及布局信息 2024-10-24 11:27:01 +08:00
YeMingfei666 a1770d596a 修改appid 2024-10-24 11:07:53 +08:00
duan 483540b6cc Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-23 17:26:35 +08:00
duan 9f3ef067df 查看耗材记录 2024-10-23 17:26:33 +08:00
魏啾 3b373d27df Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into wwz 2024-10-23 17:15:35 +08:00
魏啾 832de06d25 霸王餐 2024-10-23 17:15:13 +08:00
duan 51d273314e 状态码400的时候跳转登录。首页顶部接口返回 2024-10-23 15:28:34 +08:00
YeMingfei666 2911f11870 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-22 14:27:34 +08:00
YeMingfei666 385c95a15e 增加预发布环境 2024-10-22 14:27:16 +08:00
duan 390f286140 修改冲突 2024-10-21 16:55:58 +08:00
duan c6b4e503dc 登录保存商户信息 2024-10-21 16:55:26 +08:00
YeMingfei666 df3cf998c3 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-18 16:56:19 +08:00
YeMingfei666 f44cf801e8 修改调整页面样式 2024-10-18 16:28:04 +08:00
duan 25dfe869f0 销售汇总修改接口 2024-10-17 10:40:44 +08:00
YeMingfei666 6362ac5ee3 合并代码 2024-10-17 09:52:17 +08:00
YeMingfei666 25d10758af 更新增加打折权限校验 2024-10-17 09:48:43 +08:00
duan 2c2811f65a 修改员工权限 2024-10-17 09:47:35 +08:00
duan f0a88d3ad0 耗材接口修改 2024-10-17 09:05:45 +08:00
duan f6543e093f Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-11 18:25:51 +08:00
duan b8e694abb9 打印机部分类型 2024-10-11 18:25:37 +08:00
YeMingfei666 bc03b2c30e 去除全部请求拦截提示弹窗的icon 2024-10-11 10:01:00 +08:00
duan 82ad5973fb Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-10-10 15:22:48 +08:00
duan 16508515c4 供应商列表 2024-10-10 15:22:36 +08:00
YeMingfei666 13e851da4f Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-09 17:46:32 +08:00
YeMingfei666 d8b9bd1ad6 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-09 17:46:23 +08:00
YeMingfei666 f700096359 修改增加部分api 2024-10-09 17:33:10 +08:00
duan 37ceb6ef53 合并冲突 2024-10-09 16:49:12 +08:00
duan 4557cbef79 耗材列表 2024-10-09 16:48:21 +08:00
YeMingfei666 d7db3dd7dd Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-08 10:54:50 +08:00
YeMingfei666 ff809d87d7 更新文件上传时请求参数 2024-10-08 10:42:23 +08:00
YeMingfei666 a175a76deb Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-28 15:26:40 +08:00
YeMingfei666 624a0ca934 gh代码合并跟新设置店铺页面 2024-09-28 15:24:41 +08:00
GaoHao 78580644f5 店铺详情收款码下载处理,耗材报损增加 2024-09-28 15:16:31 +08:00
YeMingfei666 106de94d2a 更新增加部分api请求 2024-09-28 15:06:36 +08:00
duan 5d4f2c591a 打印机 2024-09-26 18:20:48 +08:00
duan 35811b80a5 拉取叶代码 2024-09-26 11:00:57 +08:00
duan 7d904db9ed 员工编辑 2024-09-24 15:35:01 +08:00
YeMingfei666 657a7c4b7f Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-24 13:21:21 +08:00
YeMingfei666 151e12a0ff Merge branch 'wwz' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-23 18:26:27 +08:00
YeMingfei666 2b6151c351 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-09-23 18:22:02 +08:00
YeMingfei666 edcf844adb 更新订单列表详情,更新商品管理,更新代客下单 2024-09-23 17:40:04 +08:00
duan f5d5aca77e Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-09-23 11:21:20 +08:00
魏啾 534766919d 交班 2024-09-23 11:11:10 +08:00
YeMingfei666 90e3866524 增加耗材接口 2024-09-20 17:02:31 +08:00
YeMingfei666 0b64341d50 增加店铺接口 2024-09-20 17:02:11 +08:00
YeMingfei666 c463150559 代客下单增加就餐模式切换接口 2024-09-20 17:01:27 +08:00
YeMingfei666 422744f162 增加商品新列表接口,耗材与商品绑定关系接口 2024-09-20 17:01:00 +08:00
GaoHao d13405ee3f 店铺详情修改 2024-09-18 16:27:53 +08:00