duan
|
daa0d18501
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-12-12 17:25:45 +08:00 |
|
duan
|
06e17a74b3
|
并转桌子
|
2024-12-12 17:25:16 +08:00 |
GaoHao
|
973450b37a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-12-11 10:41:26 +08:00 |
|
GaoHao
|
7376e40fe3
|
app升级更新添加
|
2024-12-11 10:41:13 +08:00 |
 YeMingfei666
|
fb2ac1f7c1
|
代码合并
|
2024-11-29 13:32:28 +08:00 |
|
YeMingfei666
|
0f2563af2d
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-27 15:09:54 +08:00 |
|
YeMingfei666
|
38eec83e83
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_3.0.0
|
2024-11-27 15:09:36 +08:00 |
|
GaoHao
|
8d37679bac
|
挂账增加
|
2024-11-27 11:27:54 +08:00 |
|
GaoHao
|
bcb058e136
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into gh
|
2024-11-25 17:26:42 +08:00 |
|
YeMingfei666
|
cff33a9875
|
代码合并
|
2024-11-25 13:53:29 +08:00 |
|
YeMingfei666
|
70933ce1e4
|
修改订单支付详情优惠券积分等逻辑
|
2024-11-22 14:41:38 +08:00 |
|
duan
|
6f38c95892
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-11-22 10:07:59 +08:00 |
|
duan
|
9f91ea0c27
|
员工新增管理
|
2024-11-22 10:07:40 +08:00 |
|
YeMingfei666
|
7e994f84f0
|
代客下单增加临时菜
|
2024-11-21 09:53:00 +08:00 |
|
YeMingfei666
|
3c5d89ab99
|
修改测试环境
|
2024-11-19 16:12:53 +08:00 |
|
YeMingfei666
|
28cb87202b
|
修改为预发布环境
|
2024-11-18 15:18:39 +08:00 |
|
YeMingfei666
|
7d39bc2bee
|
修改订单支付优惠券积分
|
2024-11-11 16:09:25 +08:00 |
|
YeMingfei666
|
2691cf9b53
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-11 13:20:45 +08:00 |
|
YeMingfei666
|
7d4f1607fe
|
增加隐私政策
|
2024-11-11 11:49:50 +08:00 |
|
YeMingfei666
|
f2f5bac39e
|
修改订单详情订单列表价格展示，增加会员价
|
2024-11-06 17:37:56 +08:00 |
|
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 |