Commit Graph

78 Commits

Author SHA1 Message Date
duan dc1ff9ba43 修改耗材问题 2024-11-01 16:36:14 +08:00
YeMingfei666 bd003e9d62 增加登录账号密码不对时提示将英文改成中文 2024-11-01 14:27:04 +08:00
YeMingfei666 1791d5f3d8 修改为正式服 2024-10-29 15:57:49 +08:00
YeMingfei666 b414db310d 代码合并 2024-10-29 10:45:16 +08:00
YeMingfei666 ba308fa5b5 增加正式环境 2024-10-29 09:53:15 +08:00
YeMingfei666 85b92986a7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-28 09:23:22 +08:00
YeMingfei666 96a9dfb5b5 增加订单列表详情的客座费打包费 2024-10-28 09:22:47 +08:00
GaoHao 79b258243a 新增优惠券 2024-10-26 16:17:34 +08:00
YeMingfei666 e9946fe834 增加部分接口 2024-10-25 18:10:11 +08:00
duan 4e71abaeb4 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-25 14:37:26 +08:00
duan baf3ebbc1b 会员管理 2024-10-25 14:37:22 +08:00
GaoHao b68ccf69be Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-25 11:10:44 +08:00
GaoHao 4bb4328c2f 增加消息订阅 2024-10-25 11:10:39 +08:00
duan 2cf3fe512b Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-25 10:30:31 +08:00
duan cdf0f6078c 会员管理增减余额 2024-10-25 10:30:29 +08:00
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
YeMingfei666 35d5dc3d32 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-10 16:41:42 +08:00
YeMingfei666 388f33985e 去除提示弹窗icon 2024-10-10 16:25:14 +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