Commit Graph

966 Commits

Author SHA1 Message Date
7c589b74af Merge remote-tracking branch 'origin/test' into test 2024-09-23 14:25:52 +08:00
121e25ec0f 用户查询接口支持id查询 2024-09-23 14:25:31 +08:00
21d0a29878 Merge branch 'ww' into test 2024-09-23 14:00:39 +08:00
8208f97c67 快捷修改接口 价格问题 2024-09-23 14:00:17 +08:00
551104543d 商品列表 返回库存数量 2024-09-23 13:59:59 +08:00
46f0ab568e 代客下单订单同步保存就餐人数 2024-09-23 13:40:42 +08:00
220ec46d4b 代客下单订单同步保存就餐人数 2024-09-23 13:35:05 +08:00
eacf010f15 Merge remote-tracking branch 'origin/test' into test 2024-09-23 13:29:53 +08:00
1a01ff5cce 代客下单订单同步保存餐位费 2024-09-23 13:29:15 +08:00
1babbfdefe 代客下单订单同步保存餐位费 2024-09-23 13:28:14 +08:00
31b20a92fd Merge branch 'ww' into test 2024-09-23 11:43:44 +08:00
6af7109afb 商品列表 展开问题 2024-09-23 11:43:26 +08:00
f982f82713 Merge branch 'ww' into test 2024-09-23 11:37:58 +08:00
01ba195445 商品列表 展开问题 2024-09-23 11:36:59 +08:00
3873009e63 叫号记录降序 2024-09-23 11:29:15 +08:00
f28466cfae Merge remote-tracking branch 'origin/test' into test 2024-09-23 11:16:54 +08:00
1ab55c2c46 排队取号顺延之后支持重复取号
扫码取号实现
2024-09-23 11:16:33 +08:00
2426a8155e Merge remote-tracking branch 'origin/test' into test 2024-09-23 11:01:42 +08:00
e54aaa7c14 Merge branch 'gyj' into test 2024-09-23 11:01:28 +08:00
1e54eb1456 hasPermission 增加默认值 2024-09-23 11:00:55 +08:00
a3c9deda29 员工 实体类 位置 2024-09-23 11:00:25 +08:00
871b0c5262 排队取号顺延之后支持重复取号 2024-09-23 10:59:48 +08:00
2eff0601c7 Merge remote-tracking branch 'origin/test' into test 2024-09-23 10:25:37 +08:00
272ebd6663 代客下单获取下单次数增加useType 2024-09-23 10:25:09 +08:00
96bfc97675 增加员工权限 员工权限bug 2024-09-23 10:13:16 +08:00
48abe51c47 Merge remote-tracking branch 'origin/test' into test 2024-09-23 10:10:40 +08:00
c946db4348 增加员工权限 员工权限bug 2024-09-23 10:10:19 +08:00
0fdae37924 代客下单选择人数增加用餐类型 2024-09-23 09:56:54 +08:00
f5d64cbb4a Merge remote-tracking branch 'origin/test' into test 2024-09-23 09:51:26 +08:00
0e23f94e80 叫号添加顺延 2024-09-23 09:51:05 +08:00
869059bf59 Merge remote-tracking branch 'origin/test' into test 2024-09-23 09:50:12 +08:00
db371bf9fb Merge branch 'gyj' into test 2024-09-23 09:49:42 +08:00
039c0e9166 增加员工权限 - 先插入 员工 2024-09-23 09:49:27 +08:00
f70ef125ed 员工 实体类 位置 2024-09-23 09:48:25 +08:00
099b6bed74 Merge branch 'ww' into test 2024-09-20 18:24:22 +08:00
00512ba83b 商品快捷操作接口 以及 落地记录2 2024-09-20 18:24:06 +08:00
0abcbbec32 Merge branch 'ww' into test 2024-09-20 18:18:13 +08:00
de8199df49 商品快捷操作接口 以及 落地记录 2024-09-20 18:17:26 +08:00
9e25471e1e 代码合并 2024-09-20 17:43:27 +08:00
546b63e336 Merge branch 'gyj' into test
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
2024-09-20 17:35:45 +08:00
c3597cd28e 修改台桌统计导出数据 2024-09-20 17:15:05 +08:00
d8ed96dff7 交班2 2024-09-20 16:10:36 +08:00
bd2e79027d 修改排号卓型校验nearNum 2024-09-20 11:24:58 +08:00
b81e72a0cc 修改排号卓型不校验nearNum 2024-09-20 11:22:49 +08:00
5c0b87634c Merge remote-tracking branch 'origin/test' into test 2024-09-20 11:13:38 +08:00
948932cb0a 桌型列表isPostpone改为布尔值 2024-09-20 11:12:44 +08:00
4f89609f07 Merge branch 'ww' into test 2024-09-20 11:00:03 +08:00
7d5ebbfb65 交班 api/tbHandover/handoverData 2024-09-20 10:59:22 +08:00
4a2fc4e2e0 Merge remote-tracking branch 'origin/test' into test 2024-09-20 09:49:41 +08:00
34c052902a 增加排号卓型添加顺延字段 2024-09-20 09:49:31 +08:00