 yijiegong
|
57e4a9261b
|
增加获取订阅消息二维码接口
|
2024-09-27 10:46:32 +08:00 |
 SongZhang
|
5be2e74d81
|
就餐模式切换携带tableId
|
2024-09-27 10:27:30 +08:00 |
|
SongZhang
|
e55c1744ad
|
代客下单逻辑修改
|
2024-09-27 10:21:40 +08:00 |
|
SongZhang
|
bee3d67106
|
代客下单逻辑修改
|
2024-09-27 10:17:32 +08:00 |
|
SongZhang
|
36d81b71d4
|
代客下单逻辑修改
|
2024-09-27 10:14:11 +08:00 |
|
SongZhang
|
11121d6ca2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 10:05:57 +08:00 |
|
SongZhang
|
19533f37b4
|
创建订单保存sendType
|
2024-09-27 10:05:49 +08:00 |
 wangw
|
7285de2024
|
Merge branch 'ww' into test
|
2024-09-27 09:59:10 +08:00 |
|
wangw
|
5be1876d3d
|
商品/耗材 记录接口
|
2024-09-27 09:58:03 +08:00 |
|
SongZhang
|
cf9ff5c380
|
就餐模式获取调整
|
2024-09-27 09:41:54 +08:00 |
|
SongZhang
|
b4f227878a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-27 09:12:25 +08:00 |
|
SongZhang
|
1b88298536
|
就餐模式获取调整
|
2024-09-27 09:12:14 +08:00 |
|
wangw
|
86dc91cb4e
|
Merge branch 'ww' into test
|
2024-09-26 18:09:32 +08:00 |
|
wangw
|
0447d240b2
|
商品报损 报错
主页接口 报错
|
2024-09-26 18:09:14 +08:00 |
|
SongZhang
|
6686f0c549
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 17:49:18 +08:00 |
|
SongZhang
|
1db4743ac8
|
代客下单调整
|
2024-09-26 17:49:07 +08:00 |
|
wangw
|
e5f632c036
|
Merge branch 'ww' into test
|
2024-09-26 17:24:16 +08:00 |
|
wangw
|
90382c8f59
|
主页板块报错问题
|
2024-09-26 17:23:55 +08:00 |
Tankaikai
|
39e8cded74
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 17:11:16 +08:00 |
|
Tankaikai
|
4dec40c568
|
Merge branch 'tkk' into test
|
2024-09-26 17:10:42 +08:00 |
|
谭凯凯
|
2e6518a975
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-26 17:10:08 +08:00 |
|
wangw
|
1198781b61
|
库存记录 操作人
|
2024-09-26 17:02:16 +08:00 |
|
wangw
|
3302b8dd24
|
库存记录 操作人
|
2024-09-26 17:01:35 +08:00 |
|
Tankaikai
|
7467cfa444
|
Merge branch 'tkk' into test
|
2024-09-26 16:57:10 +08:00 |
|
谭凯凯
|
61b92e07ba
|
店铺管理-店铺列表>三方配置：新增支付宝小程序appid录入项
|
2024-09-26 16:56:36 +08:00 |
|
SongZhang
|
efb7e64323
|
代客下单调整
|
2024-09-26 16:22:02 +08:00 |
|
SongZhang
|
a5c11fee41
|
代客下单调整
|
2024-09-26 16:16:50 +08:00 |
|
SongZhang
|
fbb586b3a4
|
代客下单调整
|
2024-09-26 15:54:27 +08:00 |
|
SongZhang
|
1d5c6d7f69
|
代客下单调整
|
2024-09-26 15:47:59 +08:00 |
|
SongZhang
|
d6d1691098
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 15:29:37 +08:00 |
|
SongZhang
|
094f84e92b
|
代客下单调整
|
2024-09-26 15:29:25 +08:00 |
|
wangw
|
c824146e1c
|
Merge branch 'ww' into test
|
2024-09-26 15:15:26 +08:00 |
|
wangw
|
386126cb5e
|
首页 统计 数据统计(包括弹窗)/销量统计
快捷修改接口 报错问题
|
2024-09-26 15:14:46 +08:00 |
|
wangw
|
b2dad3b3fd
|
首页 统计 数据统计(包括弹窗)/销量统计
快捷修改接口 报错问题
|
2024-09-26 15:14:40 +08:00 |
|
SongZhang
|
223585f5b9
|
餐位费支持删除
|
2024-09-26 10:41:40 +08:00 |
|
SongZhang
|
efb5281d90
|
餐位费支持删除
|
2024-09-26 10:36:43 +08:00 |
|
SongZhang
|
7877060aa0
|
修复餐位费无法结算
|
2024-09-26 10:09:25 +08:00 |
|
SongZhang
|
344c1ae874
|
修复餐位费无法结算
|
2024-09-26 10:06:51 +08:00 |
|
SongZhang
|
af74c43374
|
叫号列表固定查询0,1状态
|
2024-09-26 09:55:08 +08:00 |
|
SongZhang
|
4b60df1987
|
不统计顺延的桌号
|
2024-09-26 09:50:23 +08:00 |
|
SongZhang
|
dde33361eb
|
叫号最先保存叫号信息
|
2024-09-26 09:45:25 +08:00 |
|
SongZhang
|
224cc4999c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-26 09:38:14 +08:00 |
|
SongZhang
|
4acff0f20d
|
修复台桌金额展示有误
|
2024-09-26 09:38:04 +08:00 |
|
Tankaikai
|
8275b2709e
|
Merge branch 'tkk' into test
|
2024-09-25 18:20:49 +08:00 |
|
谭凯凯
|
0ed1e068ed
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 18:20:06 +08:00 |
|
SongZhang
|
55eb77f824
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-25 18:13:40 +08:00 |
|
SongZhang
|
f89a5f5280
|
修改台桌日期字段类型
|
2024-09-25 18:13:30 +08:00 |
|
wangw
|
b06487848f
|
Merge branch 'ww' into test
|
2024-09-25 17:39:33 +08:00 |
|
wangw
|
57269a1e92
|
耗材 记录 统计 Bug
|
2024-09-25 17:38:54 +08:00 |
|
wangw
|
ba025f0e09
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
|
2024-09-25 17:21:29 +08:00 |
|
wangw
|
faa463e396
|
耗材报损
耗材记录统计bug
|
2024-09-25 17:20:35 +08:00 |
|
wangw
|
f9f69f93cd
|
商品库存数据统计
商品库存查询变动记录
耗材库存数据统计
商品列表排序
耗材列表排序
商品报损
耗材报损
|
2024-09-25 16:00:34 +08:00 |
|
wangw
|
46beff3cd9
|
商品库存数据统计
商品库存查询变动记录
耗材库存数据统计
商品列表排序
耗材列表排序
商品报损
耗材报损
|
2024-09-25 16:00:05 +08:00 |
|
Tankaikai
|
999126b034
|
Merge branch 'tkk' into test
|
2024-09-25 15:50:06 +08:00 |
|
谭凯凯
|
80edd84c4f
|
店铺管理-店铺配置：打印机设置相关接口
|
2024-09-25 15:49:26 +08:00 |
|
wangw
|
e4b9834684
|
Merge branch 'ww' into test
|
2024-09-25 09:33:33 +08:00 |
|
wangw
|
8f5ca9b7f3
|
数据统计 报错问题
|
2024-09-25 09:32:13 +08:00 |
|
SongZhang
|
5e9d45520f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-24 18:14:50 +08:00 |
|
SongZhang
|
e745d54af6
|
订单详情返回就餐形式
|
2024-09-24 18:14:41 +08:00 |
|
wangw
|
0d77408fa5
|
Merge branch 'ww' into test
|
2024-09-24 18:14:23 +08:00 |
|
wangw
|
056126127b
|
数据统计 销售数量 视图数据
新增店铺 店铺名称 校验
|
2024-09-24 18:14:04 +08:00 |
|
wangw
|
5042ebe490
|
Merge branch 'ww' into test
|
2024-09-24 17:46:40 +08:00 |
|
wangw
|
d8841522ad
|
商品 耗材 绑定关系 接口日志
问题处理 不传规格id时 过滤
|
2024-09-24 17:46:21 +08:00 |
|
wangw
|
6c2ef5d75b
|
Merge branch 'ww' into test
|
2024-09-24 17:14:18 +08:00 |
|
wangw
|
418e834fe3
|
商品列表 耗材弹窗 添加至商品/添加至规格 1/2
|
2024-09-24 17:13:57 +08:00 |
|
wangw
|
b4c795e7d5
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
|
2024-09-24 17:08:14 +08:00 |
|
wangw
|
0de9071813
|
商品列表 耗材弹窗 添加至商品/添加至规格
|
2024-09-24 17:05:54 +08:00 |
|
SongZhang
|
064e683a68
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-24 16:35:16 +08:00 |
|
SongZhang
|
0a14ecdf16
|
叫号列表查询条件修改，取消顺延功能
|
2024-09-24 16:34:56 +08:00 |
|
wangw
|
415e6ff469
|
绑定至规格
|
2024-09-24 16:28:40 +08:00 |
|
wangw
|
82c72c9e0c
|
绑定至规格
|
2024-09-24 16:28:08 +08:00 |
|
wangw
|
8e27e25936
|
Merge branch 'ww' into test
|
2024-09-24 16:13:13 +08:00 |
|
wangw
|
c20c9c54af
|
商品 库存警戒线
快捷修改 商品退款退回库存
|
2024-09-24 16:09:47 +08:00 |
|
wangw
|
7b47f40fe8
|
库存记录 存入 统计 列表 详情列表
|
2024-09-24 15:16:30 +08:00 |
|
wangw
|
5b6e8caf35
|
上下架 报错问题
|
2024-09-24 15:16:30 +08:00 |
|
wangw
|
81a4bfdf72
|
库存记录 存入 统计 列表 详情列表
|
2024-09-24 15:15:35 +08:00 |
|
wangw
|
6b15377285
|
上下架 报错问题
|
2024-09-24 15:14:36 +08:00 |
|
SongZhang
|
1e09c75ea0
|
叫号返回叫号状态
|
2024-09-24 15:03:05 +08:00 |
|
SongZhang
|
69ec3f381c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-24 11:36:33 +08:00 |
|
SongZhang
|
e3a1b5bdf9
|
叫号报错不返回错误码
|
2024-09-24 11:36:22 +08:00 |
|
wangw
|
5fc8bfe3e5
|
Merge branch 'ww' into test
|
2024-09-24 11:27:08 +08:00 |
|
wangw
|
6300940d2e
|
商品 价格 羊角符问题
|
2024-09-24 11:25:47 +08:00 |
|
yijiegong
|
4cd7f05bc9
|
Merge branch 'gyj' into test
|
2024-09-24 11:10:39 +08:00 |
|
yijiegong
|
6a4da2891b
|
创建员工返回状态码200
|
2024-09-24 11:10:11 +08:00 |
|
wangw
|
a1293d642b
|
修改耗材
|
2024-09-24 11:07:57 +08:00 |
|
wangw
|
51480b95a8
|
修改商品 信息 快捷接口 Bug
|
2024-09-24 11:07:57 +08:00 |
|
wangw
|
6107a37eff
|
规格价格 单规格去除羊角符
|
2024-09-24 11:07:57 +08:00 |
|
wangw
|
e93e19c596
|
修改耗材
|
2024-09-24 11:07:12 +08:00 |
|
wangw
|
49ada5c669
|
修改商品 信息 快捷接口 Bug
|
2024-09-23 17:23:52 +08:00 |
|
wangw
|
259c18e131
|
规格价格 单规格去除羊角符
|
2024-09-23 17:22:03 +08:00 |
|
SongZhang
|
e3d2a9d891
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 16:13:58 +08:00 |
|
SongZhang
|
2a80dfece6
|
台桌返回当前用餐类型
|
2024-09-23 16:13:46 +08:00 |
|
wangw
|
55ead8507b
|
Merge branch 'ww' into test
|
2024-09-23 14:44:24 +08:00 |
|
wangw
|
e3845071a3
|
规格价格 去除羊角符合
|
2024-09-23 14:44:06 +08:00 |
|
SongZhang
|
7c589b74af
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 14:25:52 +08:00 |
|
SongZhang
|
121e25ec0f
|
用户查询接口支持id查询
|
2024-09-23 14:25:31 +08:00 |
|
wangw
|
21d0a29878
|
Merge branch 'ww' into test
|
2024-09-23 14:00:39 +08:00 |
|
wangw
|
8208f97c67
|
快捷修改接口 价格问题
|
2024-09-23 14:00:17 +08:00 |
|
wangw
|
551104543d
|
商品列表 返回库存数量
|
2024-09-23 13:59:59 +08:00 |
|
SongZhang
|
46f0ab568e
|
代客下单订单同步保存就餐人数
|
2024-09-23 13:40:42 +08:00 |
|
SongZhang
|
220ec46d4b
|
代客下单订单同步保存就餐人数
|
2024-09-23 13:35:05 +08:00 |
|
SongZhang
|
eacf010f15
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 13:29:53 +08:00 |
|
SongZhang
|
1a01ff5cce
|
代客下单订单同步保存餐位费
|
2024-09-23 13:29:15 +08:00 |
|
SongZhang
|
1babbfdefe
|
代客下单订单同步保存餐位费
|
2024-09-23 13:28:14 +08:00 |
|
wangw
|
31b20a92fd
|
Merge branch 'ww' into test
|
2024-09-23 11:43:44 +08:00 |
|
wangw
|
6af7109afb
|
商品列表 展开问题
|
2024-09-23 11:43:26 +08:00 |
|
wangw
|
f982f82713
|
Merge branch 'ww' into test
|
2024-09-23 11:37:58 +08:00 |
|
wangw
|
01ba195445
|
商品列表 展开问题
|
2024-09-23 11:36:59 +08:00 |
|
SongZhang
|
3873009e63
|
叫号记录降序
|
2024-09-23 11:29:15 +08:00 |
|
SongZhang
|
f28466cfae
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 11:16:54 +08:00 |
|
SongZhang
|
1ab55c2c46
|
排队取号顺延之后支持重复取号
扫码取号实现
|
2024-09-23 11:16:33 +08:00 |
|
yijiegong
|
2426a8155e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 11:01:42 +08:00 |
|
yijiegong
|
e54aaa7c14
|
Merge branch 'gyj' into test
|
2024-09-23 11:01:28 +08:00 |
|
yijiegong
|
1e54eb1456
|
hasPermission 增加默认值
|
2024-09-23 11:00:55 +08:00 |
|
wangw
|
a3c9deda29
|
员工 实体类 位置
|
2024-09-23 11:00:25 +08:00 |
|
SongZhang
|
871b0c5262
|
排队取号顺延之后支持重复取号
|
2024-09-23 10:59:48 +08:00 |
|
SongZhang
|
2eff0601c7
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 10:25:37 +08:00 |
|
SongZhang
|
272ebd6663
|
代客下单获取下单次数增加useType
|
2024-09-23 10:25:09 +08:00 |
|
yijiegong
|
96bfc97675
|
增加员工权限 员工权限bug
|
2024-09-23 10:13:16 +08:00 |
|
yijiegong
|
48abe51c47
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 10:10:40 +08:00 |
|
yijiegong
|
c946db4348
|
增加员工权限 员工权限bug
|
2024-09-23 10:10:19 +08:00 |
|
SongZhang
|
0fdae37924
|
代客下单选择人数增加用餐类型
|
2024-09-23 09:56:54 +08:00 |
|
SongZhang
|
f5d64cbb4a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 09:51:26 +08:00 |
|
SongZhang
|
0e23f94e80
|
叫号添加顺延
|
2024-09-23 09:51:05 +08:00 |
|
yijiegong
|
869059bf59
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 09:50:12 +08:00 |
|
yijiegong
|
db371bf9fb
|
Merge branch 'gyj' into test
|
2024-09-23 09:49:42 +08:00 |
|
yijiegong
|
039c0e9166
|
增加员工权限 - 先插入 员工
|
2024-09-23 09:49:27 +08:00 |
|
wangw
|
f70ef125ed
|
员工 实体类 位置
|
2024-09-23 09:48:25 +08:00 |
|
wangw
|
099b6bed74
|
Merge branch 'ww' into test
|
2024-09-20 18:24:22 +08:00 |
|
wangw
|
00512ba83b
|
商品快捷操作接口 以及 落地记录2
|
2024-09-20 18:24:06 +08:00 |
|
wangw
|
0abcbbec32
|
Merge branch 'ww' into test
|
2024-09-20 18:18:13 +08:00 |
|
wangw
|
de8199df49
|
商品快捷操作接口 以及 落地记录
|
2024-09-20 18:17:26 +08:00 |
|
SongZhang
|
9e25471e1e
|
代码合并
|
2024-09-20 17:43:27 +08:00 |
|
yijiegong
|
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 |
|
yijiegong
|
c3597cd28e
|
修改台桌统计导出数据
|
2024-09-20 17:15:05 +08:00 |
|
wangw
|
d8ed96dff7
|
交班2
|
2024-09-20 16:10:36 +08:00 |
|
SongZhang
|
bd2e79027d
|
修改排号卓型校验nearNum
|
2024-09-20 11:24:58 +08:00 |
|
SongZhang
|
b81e72a0cc
|
修改排号卓型不校验nearNum
|
2024-09-20 11:22:49 +08:00 |
|
SongZhang
|
5c0b87634c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 11:13:38 +08:00 |
|
SongZhang
|
948932cb0a
|
桌型列表isPostpone改为布尔值
|
2024-09-20 11:12:44 +08:00 |
|
wangw
|
4f89609f07
|
Merge branch 'ww' into test
|
2024-09-20 11:00:03 +08:00 |
|
wangw
|
7d5ebbfb65
|
交班 api/tbHandover/handoverData
|
2024-09-20 10:59:22 +08:00 |
|
SongZhang
|
4a2fc4e2e0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-20 09:49:41 +08:00 |
|
SongZhang
|
34c052902a
|
增加排号卓型添加顺延字段
|
2024-09-20 09:49:31 +08:00 |
|
wangw
|
c020a64469
|
Merge branch 'ww' into test
|
2024-09-20 09:28:44 +08:00 |
|
wangw
|
05e1d5390c
|
规格返回 上下架字段
|
2024-09-20 09:28:33 +08:00 |
|
wangw
|
6a96987857
|
Merge branch 'ww' into test
|
2024-09-20 09:23:57 +08:00 |
|
wangw
|
0f2eea3e13
|
商品价格范围为空问题
|
2024-09-20 09:23:45 +08:00 |
|
SongZhang
|
0d06185849
|
过号发送过号模板消息
|
2024-09-19 17:51:58 +08:00 |
|
SongZhang
|
aded35b3c1
|
排队叫号添加微信模板消息提醒
|
2024-09-19 17:46:08 +08:00 |