 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 |
|
SongZhang
|
395cd4750c
|
增加小程序模板消息配置
|
2024-09-19 17:29:16 +08:00 |
|
SongZhang
|
14c437a30e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 17:28:18 +08:00 |
|
SongZhang
|
25e45d779d
|
增加小程序模板消息配置
|
2024-09-19 17:27:55 +08:00 |
|
wangw
|
e56c7c6d81
|
商品 上下架
|
2024-09-19 17:13:17 +08:00 |
|
wangw
|
f55f709fec
|
商品 上下架
|
2024-09-19 17:12:08 +08:00 |
|
SongZhang
|
e72cc189da
|
台桌信息返回当前订单id
|
2024-09-19 17:05:27 +08:00 |
|
SongZhang
|
9cd49383ff
|
取号打票
|
2024-09-19 16:53:51 +08:00 |
|
SongZhang
|
e525d7e058
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 16:53:38 +08:00 |
|
SongZhang
|
4e76bb2736
|
代客下单就餐模式判断
|
2024-09-19 16:53:18 +08:00 |
|
wangw
|
f8ac16b457
|
Merge branch 'ww' into test
|
2024-09-19 16:06:55 +08:00 |
|
wangw
|
df3e3604f2
|
商品详情 增加关于耗材的 信息
/api/tbProskuCon/V2 新增商品耗材绑定关系
|
2024-09-19 16:06:30 +08:00 |
|
SongZhang
|
d7eaca4af2
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-19 11:14:38 +08:00 |
|
SongZhang
|
b4c1743a26
|
代客下单就餐模式切换接口
|
2024-09-19 11:14:17 +08:00 |
|
wangw
|
4a6d12f3ad
|
商品列表 V2
|
2024-09-19 11:13:18 +08:00 |
|
wangw
|
aa880477cb
|
店铺扩展信息 通过类型查询 title字段
|
2024-09-19 11:13:18 +08:00 |
|
SongZhang
|
a262f6f6b5
|
代客下单就餐模式切换接口
|
2024-09-19 10:58:16 +08:00 |
|
wangw
|
e4a8991205
|
商品列表 V2
|
2024-09-19 10:37:59 +08:00 |
|
SongZhang
|
2f6bbd4dec
|
挂单报错fix
|
2024-09-19 10:17:27 +08:00 |
|
SongZhang
|
079bf18d4c
|
叫号配置接口
|
2024-09-19 10:16:50 +08:00 |
|
SongZhang
|
66dc7c8581
|
代客下单 下单根据店铺配置校验餐位费
|
2024-09-18 17:51:55 +08:00 |
|
wangw
|
e4b25899e5
|
店铺扩展信息 通过类型查询 title字段
|
2024-09-18 17:32:55 +08:00 |
|
SongZhang
|
1b3158930f
|
代客下单支持外带用餐模式
|
2024-09-18 17:29:10 +08:00 |
|
SongZhang
|
e9fa13fdd8
|
排队取号时间格式修改
|
2024-09-18 11:09:32 +08:00 |
|
SongZhang
|
116ced92cb
|
排队取号记录修改
|
2024-09-18 10:38:51 +08:00 |
|
SongZhang
|
510372ff46
|
排队取号返回叫号信息
|
2024-09-18 10:31:52 +08:00 |
|
SongZhang
|
1cd6bca4ba
|
排号修改叫号状态修改
|
2024-09-18 10:22:32 +08:00 |
|
SongZhang
|
d0042e3d63
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-18 10:20:48 +08:00 |
|
SongZhang
|
e129be76e8
|
排号修改叫号状态修改
|
2024-09-18 10:20:26 +08:00 |
|
wangw
|
5922665e32
|
店铺扩展信息 通过类型查询
|
2024-09-18 10:08:02 +08:00 |
|
wangw
|
9fa99a28e3
|
店铺扩展信息 通过类型查询
|
2024-09-18 10:07:43 +08:00 |
|
SongZhang
|
d0cec6c5ed
|
排号获取桌型列表fix
|
2024-09-18 10:01:27 +08:00 |
|
SongZhang
|
5a6d4ce854
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 17:22:29 +08:00 |
|
SongZhang
|
04c83a5213
|
排队桌型列表状态增加筛选
|
2024-09-14 17:22:09 +08:00 |
|
wangw
|
19a4c0124e
|
Merge branch 'ww' into test
|
2024-09-14 17:16:49 +08:00 |
|
wangw
|
5215a440c9
|
去除多余注解
配置 sql日志监听
|
2024-09-14 17:15:55 +08:00 |
|
yijiegong
|
2abfc01d83
|
Merge branch 'gyj' into test
|
2024-09-14 16:59:15 +08:00 |
|
yijiegong
|
35d66973bc
|
删除注解
|
2024-09-14 16:58:47 +08:00 |
|
SongZhang
|
5351be915c
|
排队桌型列表添加总人数
|
2024-09-14 16:57:32 +08:00 |
|
SongZhang
|
b9562194b6
|
叫号报错fix
|
2024-09-14 16:48:54 +08:00 |
|
SongZhang
|
54e2bd1651
|
日志级别修改
|
2024-09-14 16:45:02 +08:00 |
|
SongZhang
|
14352a6d7b
|
排队桌型列表修改
|
2024-09-14 16:40:28 +08:00 |
|
SongZhang
|
2ff0216f68
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:28:06 +08:00 |
|
SongZhang
|
d3d401d2f3
|
排号增加天数查询限制
|
2024-09-14 16:27:54 +08:00 |
|
yijiegong
|
50dc84efd5
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 16:24:36 +08:00 |
|
yijiegong
|
b101bac68c
|
Merge branch 'gyj' into test
|
2024-09-14 16:23:36 +08:00 |
|
yijiegong
|
bdad979450
|
员工权限
|
2024-09-14 16:22:41 +08:00 |
|
SongZhang
|
48f82895e7
|
叫号增加微信提醒
|
2024-09-14 16:07:46 +08:00 |
|
SongZhang
|
f516dae0da
|
叫号记录增加字段
|
2024-09-14 16:05:08 +08:00 |
|
SongZhang
|
e35da7f608
|
叫号记录增加字段
|
2024-09-14 16:02:35 +08:00 |
|
SongZhang
|
a9589edca5
|
叫号记录增加字段
|
2024-09-14 15:59:46 +08:00 |
|
SongZhang
|
99e7cdf5a9
|
叫号记录增加字段
|
2024-09-14 15:55:22 +08:00 |
|
SongZhang
|
a956e7b764
|
叫号记录增加字段
|
2024-09-14 15:52:13 +08:00 |
|
SongZhang
|
90e8e4944e
|
叫号记录增加字段
|
2024-09-14 15:50:06 +08:00 |
|
SongZhang
|
6b9d488749
|
叫号微信小程序模板消息实现
|
2024-09-14 15:45:55 +08:00 |
|
SongZhang
|
675569c19e
|
排号增加叫号记录接口
|
2024-09-14 15:16:49 +08:00 |
|
SongZhang
|
077222c9b7
|
排号桌型列表返回总人数
|
2024-09-14 15:01:34 +08:00 |
|
SongZhang
|
8f2303d1bf
|
代客下单人数未保存fix
|
2024-09-14 14:50:22 +08:00 |
|
SongZhang
|
ec70083bd6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-14 11:47:27 +08:00 |
|
SongZhang
|
f9b5dbad58
|
台桌修改状态清除用餐人数
|
2024-09-14 11:47:03 +08:00 |
|
wangw
|
116852ce30
|
店铺参数 小程序码
|
2024-09-14 09:14:47 +08:00 |
|
wangw
|
c9c6bb6349
|
店铺参数 小程序码
|
2024-09-14 09:14:19 +08:00 |
|
SongZhang
|
78ed984ef8
|
台桌修改状态清除用餐人数
|
2024-09-13 15:45:14 +08:00 |
|
SongZhang
|
67af4f1463
|
排队取号保存号码
|
2024-09-13 15:24:11 +08:00 |
|
SongZhang
|
a73530df84
|
排队取号保存号码
|
2024-09-13 15:14:03 +08:00 |
|
SongZhang
|
5e8601745b
|
客座费修改fix
|
2024-09-13 15:13:39 +08:00 |
|
SongZhang
|
69053261e0
|
扫码排队增删改查接口
|
2024-09-13 11:49:51 +08:00 |
|
SongZhang
|
62c28fe2f6
|
扫码排队增删改查接口
|
2024-09-13 11:49:20 +08:00 |
|
SongZhang
|
b1e5ae969b
|
1.台桌列表支持精确搜索
2.台桌选择人数校验最大人数
|
2024-09-13 10:24:12 +08:00 |
|
SongZhang
|
ff27101e13
|
1.代客下单 orderDetail同步保存cartid
|
2024-09-12 16:58:35 +08:00 |
|
SongZhang
|
7c00d0d9a0
|
1.代客下单 创建订单直接付款不增加placeNum
|
2024-09-12 14:54:53 +08:00 |
|
SongZhang
|
7f0056304d
|
1.代客下单 创建订单直接付款不增加placeNum
|
2024-09-12 14:47:08 +08:00 |
|
SongZhang
|
a40431fbe7
|
1.代客下单 添加购物车新增单品备注
|
2024-09-12 14:43:54 +08:00 |
|
SongZhang
|
0f9c370118
|
1.代客下单 添加购物车新增单品备注
|
2024-09-12 14:38:45 +08:00 |
|
SongZhang
|
5c2b995d1f
|
1.代客下单 创建订单placeNum不正常修复
|
2024-09-12 14:21:56 +08:00 |
|
SongZhang
|
90d5e3888b
|
1.代客下单 退单fix
|
2024-09-12 14:08:13 +08:00 |
|
SongZhang
|
d7bf0f2811
|
1.代客下单 打印当前台桌菜品
|
2024-09-12 11:21:06 +08:00 |
|
SongZhang
|
be097e8b2d
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-12 10:47:36 +08:00 |
|
SongZhang
|
e08f83ac6e
|
1.代客下单 删除fix
|
2024-09-12 10:47:16 +08:00 |
|
wangw
|
d2d5c10b0e
|
Merge branch 'ww' into test
|
2024-09-12 10:31:53 +08:00 |
|
wangw
|
baa9c6c260
|
店铺修改 参数问题 非空
|
2024-09-12 10:31:26 +08:00 |
|
wangw
|
0a3b50ef6f
|
店铺修改 参数问题
|
2024-09-12 10:26:54 +08:00 |
|
wangw
|
8b099a2ae6
|
店铺修改 参数问题
|
2024-09-12 10:26:28 +08:00 |
|
SongZhang
|
7e29627bf6
|
1.代客下单 删除报错fix
|
2024-09-12 10:22:12 +08:00 |
|
SongZhang
|
242427f1ee
|
1.代客下单 台桌状态修改
|
2024-09-12 10:07:53 +08:00 |
|
SongZhang
|
c5d92f9ea6
|
1.代客下单 购物车返回结构修改，添加购物车不设置placeNum
|
2024-09-12 09:49:54 +08:00 |
|
SongZhang
|
48078ad2d6
|
1.代客下单 购物车返回结构修改，添加购物车不设置placeNum
|
2024-09-12 09:33:16 +08:00 |
|
SongZhang
|
7af4a48dfa
|
1.代客下单 添加台桌就餐人数
|
2024-09-11 18:04:06 +08:00 |
|
SongZhang
|
3b9617a03e
|
1.已退单商品忽略订单总价
|
2024-09-11 18:00:46 +08:00 |
|
SongZhang
|
7921c21295
|
1.取消挂单修改状态
|
2024-09-11 17:52:37 +08:00 |
|
SongZhang
|
822141899c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-11 17:37:33 +08:00 |
|
SongZhang
|
2f4fec7631
|
1.退单
|
2024-09-11 17:37:25 +08:00 |
|
wangw
|
c0bad61875
|
Merge branch 'ww' into test
|
2024-09-11 17:10:20 +08:00 |
|
wangw
|
5d15b3c309
|
翻台率 不保留小数
|
2024-09-11 17:09:44 +08:00 |
|
SongZhang
|
770c8e01f2
|
1.代客下单订单打印
2.批量生成台桌
|
2024-09-11 16:59:20 +08:00 |
|
wangw
|
1dd8dc4508
|
营业板块 金额问题
|
2024-09-11 16:54:02 +08:00 |
|
wangw
|
f039135371
|
营业板块 金额问题
|
2024-09-11 16:52:09 +08:00 |
|
SongZhang
|
2ef311f887
|
1.代客下单 创建订单更新台桌使用时间
|
2024-09-11 14:59:57 +08:00 |
|
SongZhang
|
2c99b8cd18
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:55:27 +08:00 |
|
SongZhang
|
26b3e0bc2c
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:53:21 +08:00 |
|
SongZhang
|
3ebec6f0c5
|
1.代客下单 增加自动手动清台，新增台桌订单状态信息
|
2024-09-11 14:49:22 +08:00 |
|
SongZhang
|
f2bfc718c3
|
1.代客下单 已下单商品不支持操作
|
2024-09-11 14:08:41 +08:00 |
|
SongZhang
|
dc0f6eae1e
|
1.代客下单 客位费
|
2024-09-11 11:26:58 +08:00 |
|
SongZhang
|
373fb2bdf0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-11 11:18:45 +08:00 |
|
SongZhang
|
10290bd37b
|
1.代客下单 退单接口 选择台桌 选择人数
|
2024-09-11 11:17:39 +08:00 |
|
wangw
|
535079c14d
|
店铺信息 桌位费 收款码 付款模式 就餐形式
|
2024-09-11 11:02:29 +08:00 |
|
wangw
|
df4886d62c
|
翻台率 百分数
|
2024-09-10 16:11:36 +08:00 |
|
wangw
|
efd9d78227
|
首页 数据统计
|
2024-09-10 15:54:40 +08:00 |
|
yijiegong
|
6c480acd20
|
Merge branch 'gyj' into test
|
2024-09-10 09:21:35 +08:00 |
|
yijiegong
|
260bf68c23
|
Merge branch 'gyj' into dev
|
2024-09-10 09:19:50 +08:00 |
|
yijiegong
|
c063c19532
|
二维码下载数量限制500
|
2024-09-10 09:14:37 +08:00 |
|
SongZhang
|
6096f91b6c
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-09-10 09:10:48 +08:00 |
|
wangw
|
05adbeb584
|
sql执行时长
|
2024-09-09 18:18:30 +08:00 |
|
SongZhang
|
50e0f09be8
|
1.代客下单 扫码支付记录不准确修复
|
2024-09-09 10:55:19 +08:00 |
|
SongZhang
|
09252dda7c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-09 10:39:07 +08:00 |
|
SongZhang
|
db545ee118
|
1.代客下单 扫码支付校验相关参数
|
2024-09-09 10:38:57 +08:00 |
|
wangw
|
fec443ce6c
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
# eladmin-system/src/main/resources/config/application-pre.yml
|
2024-09-09 09:59:01 +08:00 |
|
wangw
|
c618c712f3
|
验证码 区间
|
2024-09-06 17:02:29 +08:00 |
|
wangw
|
98bb93516f
|
去除实体类TagProductDepts 没有主键的提示
|
2024-09-06 11:14:50 +08:00 |
|
SongZhang
|
72a3057126
|
1.代客下单 失败添加消息提示
|
2024-09-05 15:04:23 +08:00 |
|
SongZhang
|
b7fc525623
|
1.代客下单 失败添加消息提示
|
2024-09-05 15:01:31 +08:00 |
|
SongZhang
|
f458e6f77e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 14:57:27 +08:00 |
|
SongZhang
|
7b91549664
|
1.代客下单 失败添加消息提示
|
2024-09-05 14:57:15 +08:00 |
|
wangw
|
10373ab45f
|
版本管理列表 时间倒叙
|
2024-09-05 11:01:36 +08:00 |
|
SongZhang
|
a08d181e77
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-05 10:54:58 +08:00 |
|
SongZhang
|
50faef4a20
|
1.代客下单 失败添加消息提示
|
2024-09-05 10:54:36 +08:00 |
|
wangw
|
782a152243
|
pre 内网访问数据库
|
2024-09-05 10:11:11 +08:00 |
|
SongZhang
|
8f002b689d
|
1.代客下单 折扣差1修复
|
2024-09-05 09:56:38 +08:00 |
|
wangw
|
4bd99e7f6e
|
预发布 mq端口修改
|
2024-09-05 09:54:47 +08:00 |
|
wangw
|
1cb099702a
|
预发布 mq端口修改
|
2024-09-05 09:47:07 +08:00 |
|
SongZhang
|
3174c9abf3
|
1.代客下单 扫码支付，储值卡扫码支付, 台桌状态
|
2024-09-05 09:27:35 +08:00 |
|
SongZhang
|
fed5b28ce2
|
1.代客下单 扫码支付，储值卡扫码支付, 台桌状态
|
2024-09-05 09:24:50 +08:00 |
|
wangw
|
53512a0b37
|
简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:32:01 +08:00 |
|
wangw
|
be701b46ec
|
简化验证码计算
测试环境 修改数据连接地址
新增 pre 预发布配置
|
2024-09-04 11:30:56 +08:00 |
|
SongZhang
|
8247b3b4bd
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 10:19:08 +08:00 |
|
SongZhang
|
963920fd2a
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 10:18:07 +08:00 |
|
SongZhang
|
0b645bd695
|
1.代客下单 扫码支付，储值卡扫码支付
|
2024-09-04 09:21:25 +08:00 |
|
SongZhang
|
44329cc64e
|
1.代客下单 支付折扣
|
2024-09-03 11:09:36 +08:00 |
|
wangw
|
37be5a521e
|
设置验证码接口
|
2024-09-03 10:57:18 +08:00 |
|
SongZhang
|
d63861ac13
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-03 10:42:09 +08:00 |
|
SongZhang
|
1b9b088e43
|
1.代客下单 创建订单删除小程序购物车缓存
|
2024-09-03 10:41:57 +08:00 |
牛叉闪闪
|
6e31bb6251
|
添加会员流水
|
2024-09-02 16:27:55 +08:00 |
|
牛叉闪闪
|
4b5c272cd9
|
添加会员流水
|
2024-09-02 15:03:40 +08:00 |
|
SongZhang
|
5480d0eb5f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-02 14:51:05 +08:00 |
|
SongZhang
|
be4f8cbbdd
|
1.代客下单 创建订单增加锁
2.代客下单 主扫支付
|
2024-09-02 14:50:40 +08:00 |
|
牛叉闪闪
|
923c204c3c
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
|
2024-09-02 14:43:29 +08:00 |
|
牛叉闪闪
|
b1219a114b
|
添加会员流水
|
2024-09-02 14:41:57 +08:00 |
|
牛叉闪闪
|
94e875008b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-01 13:37:28 +08:00 |
|
牛叉闪闪
|
e823832cdb
|
添加多规格商品价格最大值
|
2024-09-01 13:36:28 +08:00 |
|
SongZhang
|
cce10b9475
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-31 16:48:48 +08:00 |
|
SongZhang
|
68b9b1ab98
|
1.代客下单 创建订单保存订单id到缓存
2.修复挂起订单重复打票
|
2024-08-31 16:48:37 +08:00 |
|
yijiegong
|
e131095e45
|
Merge branch 'test' into dev
|
2024-08-31 09:13:18 +08:00 |
|
yijiegong
|
c2843ecc3d
|
店铺扩展默认参数修改
|
2024-08-31 09:12:05 +08:00 |
|
SongZhang
|
7b62f75cca
|
1.代客下单 创建订单保存台桌名称
|
2024-08-30 17:27:55 +08:00 |
|
SongZhang
|
d6756ee2e3
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-30 15:27:42 +08:00 |
|
SongZhang
|
26f6af0256
|
1.代客下单 添加购物车接口添加id
|
2024-08-30 15:27:31 +08:00 |
|
yijiegong
|
77f01cabdc
|
userId 为null处理
|
2024-08-30 11:49:42 +08:00 |
|
yijiegong
|
33a0722c8c
|
userId 为null处理
|
2024-08-30 11:33:10 +08:00 |
|
yijiegong
|
b0392f70e1
|
userId 为null处理
|
2024-08-30 11:32:09 +08:00 |
|
yijiegong
|
9ea2ecf552
|
查询会员订单数量bug修复
|
2024-08-30 11:26:23 +08:00 |
|
SongZhang
|
52410b73f1
|
1.代客下单 支持下单修改会员
|
2024-08-29 18:26:22 +08:00 |
|
SongZhang
|
a68b7ee991
|
1.代客下单，折扣
|
2024-08-29 17:59:16 +08:00 |
|
SongZhang
|
71bc936074
|
1.代客下单，折扣
|
2024-08-29 17:57:56 +08:00 |
|
SongZhang
|
297ccc0233
|
1.代客下单，折扣
|
2024-08-29 14:13:19 +08:00 |
|
SongZhang
|
417451f432
|
1.修改会员余额支付备注
|
2024-08-29 13:45:49 +08:00 |
|
SongZhang
|
0fe0722893
|
1.代客下单 挂起订单增加masterId
|
2024-08-29 11:27:51 +08:00 |
|
wangw
|
dc176f6e46
|
代客下单 商品列表 数据缺失问题
|
2024-08-28 18:04:57 +08:00 |
|
wangw
|
59843ce046
|
代客下单 createOrder 报错问题
|
2024-08-28 17:32:07 +08:00 |
|
wangw
|
979a3a6ade
|
版本文件 接口记录
|
2024-08-28 16:21:55 +08:00 |
|
wangw
|
17fc234975
|
版本管理 和 版本文件上传
|
2024-08-28 15:45:46 +08:00 |
|
wangw
|
09c6cd178a
|
订单生成 库存消耗记录 并记录销量
|
2024-08-28 15:45:21 +08:00 |
|
wangw
|
fcff40f72b
|
店铺扩展信息 初始化数据
|
2024-08-28 15:44:33 +08:00 |
|
牛叉闪闪
|
221ad5a8d4
|
添加退款、会员退款、会员充值控制
|
2024-08-28 14:09:56 +08:00 |
|
yijiegong
|
8558343524
|
Merge branch 'gyj' into test
|
2024-08-28 13:35:19 +08:00 |
|
yijiegong
|
e48029a9a4
|
广告查询bug修改
|
2024-08-28 13:34:11 +08:00 |
|
wangw
|
489b3597d6
|
店铺扩展数据 初始化四条数据
|
2024-08-27 17:57:13 +08:00 |
|
牛叉闪闪
|
2ca427f808
|
添加退款、会员退款、会员充值控制
|
2024-08-27 17:33:10 +08:00 |
|
yijiegong
|
e9711dffe3
|
Merge branch 'gyj' into test
|
2024-08-27 16:00:10 +08:00 |
|
yijiegong
|
d7fe7cf40a
|
订单查询增加userId参数筛选
|
2024-08-27 15:59:43 +08:00 |
|
SongZhang
|
30407b1715
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-27 15:58:45 +08:00 |
|
SongZhang
|
2e5cc6ab92
|
1.代客下单 specSnap为null fix
|
2024-08-27 15:53:38 +08:00 |
|
wangw
|
b01812bce9
|
获取会员页面 二维码
|
2024-08-27 15:47:29 +08:00 |
|
牛叉闪闪
|
58a3ac0ed0
|
添加退款、会员退款、会员充值控制
|
2024-08-27 14:42:19 +08:00 |
|
yijiegong
|
6863fbc100
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-08-27 11:06:16 +08:00 |
|
SongZhang
|
4929e467ab
|
1.代客下单 masterId实时更新修复
|
2024-08-27 10:44:50 +08:00 |
|
yijiegong
|
d78a7a7ac6
|
添加最后登录时间 1
|
2024-08-26 11:41:35 +08:00 |
|
yijiegong
|
6ba0544243
|
添加最后登录时间
|
2024-08-26 11:38:24 +08:00 |
|
yijiegong
|
bbcd6edf20
|
添加最后登录时间
|
2024-08-26 11:33:11 +08:00 |
|
牛叉闪闪
|
f0476f05e0
|
添加退款、会员退款、会员充值控制
|
2024-08-26 10:53:48 +08:00 |
|
SongZhang
|
48aab9eeac
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:21:21 +08:00 |
|
SongZhang
|
078a986e6b
|
1.代客下单 库存不足提示商品名
|
2024-08-26 10:17:38 +08:00 |
|
SongZhang
|
d272efa45f
|
1.代客下单 只查询当天挂起订单
|
2024-08-26 09:21:50 +08:00 |
|
SongZhang
|
29ccf35e5f
|
1.代客下单 存单返回备注内容
|
2024-08-23 17:48:36 +08:00 |
|
SongZhang
|
f9931b50ea
|
1.代客下单 存单保存备注
|
2024-08-23 17:26:54 +08:00 |
|
SongZhang
|
f6e473b8bb
|
1.代客下单 取单不操作购物车状态
|
2024-08-23 15:34:13 +08:00 |
|
SongZhang
|
98bc995b71
|
1.代客下单 挂单列表数量不准确fix
|
2024-08-23 14:57:51 +08:00 |
|
SongZhang
|
96791306f2
|
1.代客下单 挂单之后masterId未增加修复
|
2024-08-23 14:51:47 +08:00 |
|
SongZhang
|
b4f113e811
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:23:35 +08:00 |
|
SongZhang
|
01d92b3812
|
1.代客下单 挂单列表根据tableId获取
|
2024-08-23 14:14:59 +08:00 |
|
SongZhang
|
e16d9dfcb1
|
1.代客下单 创建订单会员为null修复
|
2024-08-23 13:34:03 +08:00 |
|
SongZhang
|
64e89d5ed6
|
1.代客下单 取单sql fix
|
2024-08-23 13:31:10 +08:00 |
|
SongZhang
|
28874a59f1
|
1.代客下单 添加购物车 不查询昨日数据
|
2024-08-23 11:48:02 +08:00 |
|
wangw
|
12e7379cbf
|
Merge branch 'ww' into test
|
2024-08-23 11:36:52 +08:00 |
|
wangw
|
a2e16bf05d
|
订单管理 会员商品 名称 变黄
|
2024-08-23 11:34:37 +08:00 |
|
SongZhang
|
f8a9022064
|
1.代客下单 会员支付，台桌状态问题
|
2024-08-23 11:06:26 +08:00 |
|
SongZhang
|
ce54b66205
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-23 10:47:48 +08:00 |
|
SongZhang
|
8381287036
|
1.代客下单 会员支付，负数余额问题
|
2024-08-23 10:47:38 +08:00 |
|
wangw
|
112206d2ec
|
Merge branch 'ww' into test
|
2024-08-23 10:39:47 +08:00 |
|
wangw
|
16f07f2f40
|
赠送商品 为空时
|
2024-08-23 10:39:33 +08:00 |
|
wangw
|
52dce24fb8
|
赠送商品为空
|
2024-08-23 10:32:57 +08:00 |
|
SongZhang
|
614ffc9abf
|
1.代客下单 同步查询小程序购物车商品
|
2024-08-23 10:28:49 +08:00 |
|
SongZhang
|
532dec69e3
|
1.代客下单 同步查询小程序购物车商品
|
2024-08-23 09:41:27 +08:00 |
|
SongZhang
|
9e26fad331
|
1.代客下单 会员支付实现
|
2024-08-23 09:20:51 +08:00 |
|
yijiegong
|
c408e8e168
|
Merge branch 'gyj' into test
|
2024-08-22 16:20:51 +08:00 |
|
yijiegong
|
2a6c54ba47
|
桌台统计添加收银台
|
2024-08-22 16:20:20 +08:00 |
|
wangw
|
bffa05f07f
|
Merge branch 'ww' into test
|
2024-08-22 16:04:30 +08:00 |
|
wangw
|
91e2e0caaf
|
活动赠送商品
订单超时 回滚赠送使用数量
|
2024-08-22 16:04:12 +08:00 |
|
SongZhang
|
d981259995
|
1.代客下单 挂单不增加masterId
|
2024-08-21 13:29:30 +08:00 |
|
SongZhang
|
a9e5ad8229
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:36:57 +08:00 |
|
SongZhang
|
edadbb5662
|
1.代客下单 挂单不增加masterId
|
2024-08-21 11:02:38 +08:00 |
|
SongZhang
|
7d37e58206
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-21 10:46:16 +08:00 |
|
SongZhang
|
91751b0f32
|
1.代客下单 台桌状态同步更新
|
2024-08-21 10:45:59 +08:00 |
|
wangw
|
7f78921eda
|
Merge branch 'ww' into test
|
2024-08-21 10:16:37 +08:00 |
|
wangw
|
e3e0c93502
|
店铺扩展信息 新增时 key不可重复
|
2024-08-21 10:16:22 +08:00 |
|
wangw
|
df0570860d
|
店铺扩展信息 增加描述字段
|
2024-08-21 09:36:21 +08:00 |
|
SongZhang
|
7d1571628f
|
1.代客下单 选择会员fix
|
2024-08-20 18:15:37 +08:00 |
|
SongZhang
|
4e5c560d95
|
1.代客下单 选择会员fix
|
2024-08-20 18:11:13 +08:00 |
GYJ
|
0d8aa662e4
|
Merge branch 'refs/heads/gyj' into test
|
2024-08-20 17:31:05 +08:00 |
|
GYJ
|
beea5e902c
|
修改查询会员列表 - 从shopUser查询
|
2024-08-20 17:30:24 +08:00 |
|
SongZhang
|
98cf4f2f6d
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 17:05:46 +08:00 |
|
SongZhang
|
376af15266
|
1.代客下单 新增后付款下单
|
2024-08-20 17:05:36 +08:00 |
|
牛叉闪闪
|
f00ad6a46c
|
添加员工折扣字段
|
2024-08-20 16:13:13 +08:00 |
|
牛叉闪闪
|
972ab851c8
|
修改增加减少用户资金接口
|
2024-08-20 15:30:21 +08:00 |
|
牛叉闪闪
|
aa7c5d3744
|
修改增加减少用户资金接口
|
2024-08-20 15:20:04 +08:00 |
|
wangw
|
b9157ddc6b
|
Merge branch 'ww' into test
|
2024-08-20 14:58:12 +08:00 |
|
wangw
|
1cb0d9c80f
|
会员活动赠送商品
|
2024-08-20 14:57:55 +08:00 |
|
SongZhang
|
830271a838
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 14:47:50 +08:00 |
|
SongZhang
|
b388b3a044
|
1.库存排序
|
2024-08-20 14:47:32 +08:00 |
|
牛叉闪闪
|
049f52499e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 14:46:52 +08:00 |
|
牛叉闪闪
|
d6b8919294
|
修改增加减少用户资金接口
|
2024-08-20 14:46:12 +08:00 |
|
SongZhang
|
fcfe0a2f53
|
1.库存排序
|
2024-08-20 14:39:01 +08:00 |
|
SongZhang
|
a90c441988
|
Merge remote-tracking branch 'origin/test' into zs
|
2024-08-19 17:45:09 +08:00 |
|
SongZhang
|
d6bbe73d58
|
1.代客下单 会员点单 取消点单
|
2024-08-19 17:42:47 +08:00 |
|
牛叉闪闪
|
2567044da8
|
添加是否允许会员自定义金额字段
|
2024-08-19 17:41:25 +08:00 |
|
SongZhang
|
15de68b704
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:24:45 +08:00 |
|
SongZhang
|
2252f4edcb
|
Merge remote-tracking branch 'origin/test' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
|
2024-08-19 16:15:52 +08:00 |
|
SongZhang
|
ea86b42847
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:15:01 +08:00 |
|
GYJ
|
53275cd5de
|
集成model类型修改
|
2024-08-19 16:09:44 +08:00 |
|
SongZhang
|
b5fc56c0aa
|
1.代客下单 挂单规格返回
|
2024-08-19 15:43:11 +08:00 |
|
SongZhang
|
a74612f5a6
|
1.代客下单 桌号获取
|
2024-08-19 14:12:07 +08:00 |
|
牛叉闪闪
|
95e37c2048
|
添加增加减少会员余额接口
|
2024-08-19 11:25:01 +08:00 |
|
牛叉闪闪
|
635625842a
|
添加增加减少会员余额接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
53fd7e24c0
|
判断修改耗材参数
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
cf62b77128
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
58eb528047
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
SongZhang
|
4909ebe807
|
1.代客下单 删除订单接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
fa868cce31
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
SongZhang
|
5f2950ab72
|
1.代客下单挂单修改
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
8da97add53
|
1.商品不推送修复
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
2250bda5c1
|
分组时间管控
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
e3f68dc486
|
用户管理 排序
|
2024-08-19 11:23:58 +08:00 |
|
wangw
|
ff07ab528e
|
活动管理 赠送商品
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
0ec21c31e9
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
SongZhang
|
8d73b216ef
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
GYJ
|
5643faab22
|
弹窗广告
|
2024-08-19 11:16:47 +08:00 |
|
SongZhang
|
c51e0ec580
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-19 10:12:02 +08:00 |
|
SongZhang
|
96f1dcb768
|
1.代客下单 删除订单接口
|
2024-08-19 10:11:51 +08:00 |
|
牛叉闪闪
|
9f6f7c2a78
|
判断修改耗材参数
|
2024-08-19 09:45:48 +08:00 |
|
GYJ
|
e1499150f9
|
修改库存开关导致数据缺失的问题
|
2024-08-18 20:24:26 +08:00 |
|
GYJ
|
e6b8414366
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
|
2024-08-18 20:14:25 +08:00 |
|
牛叉闪闪
|
085ae733e2
|
添加耗材信息单价字段
|
2024-08-17 18:33:35 +08:00 |
|
牛叉闪闪
|
9b8ec56b96
|
添加耗材信息单价字段
|
2024-08-17 18:25:03 +08:00 |
|
SongZhang
|
d10a9671a9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 17:37:23 +08:00 |
|
SongZhang
|
7da10ca43e
|
1.代客下单挂单修改
|
2024-08-17 17:37:06 +08:00 |
|
牛叉闪闪
|
a21e361b4e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-17 17:04:08 +08:00 |
|
SongZhang
|
e8f9af93e8
|
1.商品不推送修复
|
2024-08-17 16:57:51 +08:00 |
|
SongZhang
|
fcaba6d511
|
1.商品不推送修复
|
2024-08-17 16:52:29 +08:00 |
|
SongZhang
|
b13a48d5e5
|
1.商品不推送修复
|
2024-08-17 16:49:18 +08:00 |
|
牛叉闪闪
|
3807eb43ce
|
添加耗材信息单价字段
|
2024-08-17 15:28:21 +08:00 |
|
SongZhang
|
7eab45ae49
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 15:22:38 +08:00 |
|
SongZhang
|
89582d3bc8
|
1.代客下单 挂起订单
|
2024-08-17 15:21:45 +08:00 |
|
wangw
|
1de1edb537
|
分组时间管控
|
2024-08-17 14:38:00 +08:00 |
|
wangw
|
df95c09724
|
用户管理 排序
|
2024-08-17 14:15:12 +08:00 |
|
wangw
|
a53e9f7ab4
|
活动管理 赠送商品
|
2024-08-17 11:49:01 +08:00 |
|
GYJ
|
8e0f237e2e
|
台桌数据导出修改
|
2024-08-17 11:29:59 +08:00 |
|
SongZhang
|
e938911e4a
|
1.代客下单 挂起订单
|
2024-08-17 10:03:11 +08:00 |
|
牛叉闪闪
|
0c5192e86e
|
添加耗材信息更新时间和创建时间字段
|
2024-08-16 18:13:51 +08:00 |
|
wangw
|
5732e6974f
|
商品分组-时段 跨日的展示 次日
|
2024-08-16 18:00:25 +08:00 |
|
wangw
|
adee84544d
|
数据报表-销量-统计
|
2024-08-16 14:52:59 +08:00 |
|
SongZhang
|
7c122565fc
|
1.增加库存记录mq处理
|
2024-08-16 14:45:50 +08:00 |
|
SongZhang
|
b8a60a1549
|
1.增加库存记录mq处理
|
2024-08-16 13:38:52 +08:00 |
|
SongZhang
|
d32f9705a0
|
1.代客下单，支付，挂起，下单接口开发
|
2024-08-16 11:12:25 +08:00 |
|
SongZhang
|
62ca02cdc4
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-16 11:11:21 +08:00 |
|
SongZhang
|
4a8bce3c34
|
1.增加库存预警模板消息id
|
2024-08-16 11:10:54 +08:00 |
|
wangw
|
199e787d92
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-16 09:23:43 +08:00 |
|
wangw
|
7271e77b05
|
数据报表-销量-统计
商品 规格 返回
|
2024-08-15 18:23:46 +08:00 |
|
GYJ
|
a183d2bfec
|
修改销量和台桌导出 -- 合并
|
2024-08-15 17:33:03 +08:00 |
|
GYJ
|
fa566a7057
|
Merge branch 'refs/heads/gyj' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-08-15 17:31:07 +08:00 |
|
GYJ
|
3d9e4ee511
|
修改销量和台桌导出
|
2024-08-15 17:25:36 +08:00 |
|
GYJ
|
f808912006
|
Merge branch 'refs/heads/test' into gyj
|
2024-08-15 13:50:16 +08:00 |
|
牛叉闪闪
|
5fe0e2a83b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-14 15:08:48 +08:00 |
|
牛叉闪闪
|
9d8bb72a7e
|
添加耗材库存检测开关
|
2024-08-14 15:08:28 +08:00 |
|
SongZhang
|
a0930151a8
|
1.推送修改
|
2024-08-14 15:05:16 +08:00 |
|
SongZhang
|
441ecf38f1
|
1.代客下单相关接口
|
2024-08-14 15:04:53 +08:00 |
|
SongZhang
|
9bfa67d71b
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-14 11:31:31 +08:00 |
|
牛叉闪闪
|
9ec06de8cd
|
添加耗材库存检测开关
|
2024-08-14 11:29:15 +08:00 |
|
wangw
|
cd6d6f2e07
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
|
2024-08-14 11:17:16 +08:00 |
|
SongZhang
|
27f7d07f27
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-14 11:01:18 +08:00 |
|
牛叉闪闪
|
b08ff62d86
|
修改耗材信息
|
2024-08-14 10:59:27 +08:00 |
|
SongZhang
|
7715b758f1
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-14 10:28:04 +08:00 |
|
牛叉闪闪
|
6e03ad4997
|
添加订单数量和充值金额字段
|
2024-08-14 10:19:47 +08:00 |
|
wangw
|
c35df24d2d
|
分组增加可售时段
|
2024-08-14 09:43:25 +08:00 |
|
牛叉闪闪
|
eb32bedc25
|
修改会员充值奖励功能
|
2024-08-13 14:50:27 +08:00 |
|
SongZhang
|
a7de11423f
|
1.数据报表导出cpu拉高问题修复
2.代客下单相关接口
|
2024-08-13 14:39:32 +08:00 |
|
SongZhang
|
e53037232f
|
1.数据报表导出cpu拉高问题修复
|
2024-08-13 10:59:27 +08:00 |
|
SongZhang
|
fd5b79d6ec
|
1.代客下单规格修改接口
|
2024-08-13 09:48:03 +08:00 |
|
SongZhang
|
7f1c028fed
|
1.代课下单支持赠送
|
2024-08-13 09:02:44 +08:00 |
|
SongZhang
|
66ae922dc4
|
Merge remote-tracking branch 'origin/zs' into test
|
2024-08-12 15:33:21 +08:00 |
|
SongZhang
|
0e9996bcf0
|
1.通知中心相关接口
2.代客下单
|
2024-08-12 14:55:21 +08:00 |
|
wangw
|
d862eb43be
|
获取商家 会员二维码
|
2024-08-12 14:18:31 +08:00 |
|
wangw
|
5cf796ac83
|
sql skuId问题
|
2024-08-12 13:57:41 +08:00 |
|
SongZhang
|
220c717085
|
1.下架无法查询到导致报错问题修复
|
2024-08-09 10:23:57 +08:00 |
|
wangw
|
8e1aa5bc19
|
修改商品 规格
|
2024-08-08 14:25:42 +08:00 |
|
GYJ
|
bff2ad2250
|
优化台桌统计
|
2024-08-08 10:42:13 +08:00 |
|
GYJ
|
b218436a1c
|
优化台桌统计
|
2024-08-08 10:41:12 +08:00 |
|
wangw
|
9e13d1ff98
|
商品规格修改
|
2024-08-08 09:12:35 +08:00 |
|
牛叉闪闪
|
568375b115
|
修改盘点库存数字校验
|
2024-08-05 15:27:47 +08:00 |
|
牛叉闪闪
|
13961cc6fc
|
修改查询交班数据
|
2024-08-05 14:31:09 +08:00 |
|
牛叉闪闪
|
b8e1907d49
|
修改供应商为非必填
|
2024-08-05 11:32:15 +08:00 |
|
牛叉闪闪
|
115c722e3b
|
修改供应商为非必填
|
2024-08-05 11:21:23 +08:00 |
|
牛叉闪闪
|
e89b9e4eef
|
Merge remote-tracking branch 'origin/dev'
|
2024-08-05 10:20:33 +08:00 |
|
牛叉闪闪
|
9de0c594cd
|
修改供应商为非必填
|
2024-08-05 10:18:34 +08:00 |
|
牛叉闪闪
|
e9b0301eb9
|
修改供应商为非必填
|
2024-08-03 18:28:25 +08:00 |
|
牛叉闪闪
|
11e2663fb3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 18:22:58 +08:00 |
|
牛叉闪闪
|
443df8faa3
|
修改供应商为非必填
|
2024-08-03 18:22:36 +08:00 |
|
wangw
|
60cdf33b7b
|
用户 修改密码
|
2024-08-03 17:35:28 +08:00 |
|
wangw
|
f18769abd5
|
登录回传
|
2024-08-03 15:39:49 +08:00 |
|
牛叉闪闪
|
db15b53826
|
修改供应商为非必填
|
2024-08-03 15:32:44 +08:00 |
|
wangw
|
a1ebe64c20
|
登录回传 用户标识
|
2024-08-03 15:29:41 +08:00 |
|
wangw
|
cf2ac9755f
|
商品出入库 和 耗材出入库 日志记录 明确描述
|
2024-08-03 14:44:33 +08:00 |
|
wangw
|
b70c00667a
|
商品出入库 和 耗材出入库 日志记录 明确描述
|
2024-08-03 14:44:09 +08:00 |
|
SongZhang
|
96b9d50088
|
多规格商品，不共享库存，一个规格为上架状态，其他规格为下架状态，开启共享库存，共享库存为下架状态
|
2024-08-03 09:54:29 +08:00 |
|
SongZhang
|
f0755c58a1
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-03 09:50:44 +08:00 |
|
wangw
|
48488daad8
|
员工删除
个人中心 修改密码
商品设置热门
|
2024-08-02 16:43:46 +08:00 |
|
SongZhang
|
49ec7ab65d
|
1.数据报表销量导出修改
2.开启关闭库存分组微信提醒
3.盘点出入库展示规格名称
|
2024-08-02 16:11:23 +08:00 |
|
SongZhang
|
6cc0da2ed0
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-02 09:12:28 +08:00 |
|
wangw
|
b0e60ba54e
|
实体类问题
|
2024-08-01 18:27:24 +08:00 |
|
wangw
|
8a07cde563
|
Merge branch 'dev'
|
2024-08-01 18:24:27 +08:00 |
|
wangw
|
16c6ff1ccf
|
日志标识
|
2024-08-01 18:21:06 +08:00 |
|
wangw
|
d2a18664ea
|
商品修改回滚
|
2024-08-01 18:15:27 +08:00 |
|
GYJ
|
0a0a863472
|
Revert "1.编辑商品不影响上下架"
This reverts commit ccba29361b.
|
2024-08-01 18:13:22 +08:00 |
|
wangw
|
9fcc5df6b9
|
员工重复账号
员工登录
角色重复
|
2024-08-01 18:13:12 +08:00 |
|
GYJ
|
cdceb51f92
|
Merge branch 'refs/heads/dev'
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
|
2024-08-01 18:10:07 +08:00 |
|
wangw
|
25b4a4ca2f
|
重复账号
|
2024-08-01 17:34:21 +08:00 |
|
wangw
|
c219d32259
|
员工详情
|
2024-08-01 17:26:32 +08:00 |
|
SongZhang
|
556b0338de
|
数据报表销量导出修改
|
2024-08-01 17:15:40 +08:00 |
|
SongZhang
|
4f7a387349
|
数据报表销量导出修改
|
2024-08-01 16:07:29 +08:00 |
|
SongZhang
|
ccba29361b
|
1.编辑商品不影响上下架
|
2024-08-01 14:22:33 +08:00 |
|
GYJ
|
b7453e1123
|
增加日志
|
2024-08-01 10:43:11 +08:00 |
|
SongZhang
|
420c52abbc
|
1.规格不展示修复
|
2024-07-31 16:30:35 +08:00 |
|
wangw
|
498de25b9b
|
退单显示负数
|
2024-07-31 15:31:11 +08:00 |
|
wangw
|
762e5a9f36
|
登录
|
2024-07-30 16:50:59 +08:00 |
|
wangw
|
a2844da331
|
员工账号 唯一问题
登录
|
2024-07-30 15:29:19 +08:00 |
|
wangw
|
4655786218
|
查询接口不做记录
|
2024-07-30 15:20:37 +08:00 |
|
wangw
|
407f58ea37
|
创建店铺 同步创建管理账号 昵称为店铺名称
修改店铺 如果修改名称 昵称同步修改
|
2024-07-30 15:15:39 +08:00 |
|
GYJ
|
b7ec560d11
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-30 15:15:09 +08:00 |
|
GYJ
|
84802d508f
|
不同店铺之间员工账户可重复
|
2024-07-30 15:14:51 +08:00 |
|
牛叉闪闪
|
1b116ed8b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-30 15:14:32 +08:00 |
|
牛叉闪闪
|
4a94d85b83
|
修改方法
|
2024-07-30 15:14:19 +08:00 |
|
SongZhang
|
090203afef
|
1.库存记录错误sql修复
|
2024-07-30 15:13:40 +08:00 |
|
SongZhang
|
2671526c11
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-07-30 15:09:18 +08:00 |
|
SongZhang
|
d68de07728
|
1.库存记录错误sql修复
|
2024-07-30 15:08:11 +08:00 |
|
wangw
|
292d2325a3
|
接口查询 不做日志记录
日志记录为 员工名称
|
2024-07-30 14:53:14 +08:00 |
|
牛叉闪闪
|
1d0e81a55a
|
修改方法
|
2024-07-30 14:51:36 +08:00 |
|
牛叉闪闪
|
f8e4834e69
|
修改方法
|
2024-07-30 14:39:00 +08:00 |
|
GYJ
|
820237d63e
|
添加商品 填充预警值字段
|
2024-07-30 11:29:31 +08:00 |
|
GYJ
|
f1ee8d0de5
|
Merge branch 'refs/heads/dev' into gyj
|
2024-07-30 11:12:16 +08:00 |
|
GYJ
|
8486461224
|
Merge remote-tracking branch 'origin/zstmp' into gyj
|
2024-07-30 11:11:53 +08:00 |
|
牛叉闪闪
|
0aa0bcda77
|
添加出入库备注
|
2024-07-29 17:38:11 +08:00 |
|
牛叉闪闪
|
d8aaeff997
|
添加出入库备注
|
2024-07-29 17:23:21 +08:00 |
|
GYJ
|
68ed64849a
|
员工登录状态校验
|
2024-07-29 14:54:32 +08:00 |
|
GYJ
|
08f3f8b5e0
|
员工登录状态校验
|
2024-07-29 13:26:38 +08:00 |
|
GYJ
|
cb7246d5fa
|
判断中文正则表达式
|
2024-07-29 11:47:45 +08:00 |
|
GYJ
|
02167b163a
|
员工bug fix
|
2024-07-29 11:29:18 +08:00 |
|
牛叉闪闪
|
e44cf94993
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-29 10:32:21 +08:00 |
|
牛叉闪闪
|
37c5aa1226
|
添加类型判断
|
2024-07-29 10:32:06 +08:00 |
|
SongZhang
|
6521464900
|
1.规格
|
2024-07-26 18:07:13 +08:00 |
|
SongZhang
|
275b781f48
|
1.默认上下架
|
2024-07-26 18:05:11 +08:00 |
|
wangw
|
92e743cb8f
|
商家管理员账号 默认为店铺名称
修改时 该店铺的 Master员工 名称一律为店铺名称
|
2024-07-26 16:47:01 +08:00 |
|
wangw
|
80e666126c
|
修改时 员工账户不可重复
|
2024-07-26 15:35:51 +08:00 |
|
wangw
|
5dff4105e6
|
修改时 员工账户不可重复
|
2024-07-26 15:32:24 +08:00 |
|
wangw
|
e592d5503d
|
员工账户校验
|
2024-07-26 14:36:15 +08:00 |
|
wangw
|
0d81d6ea5a
|
账户校验
|
2024-07-26 14:32:39 +08:00 |
|
wangw
|
aee7e1fa0f
|
账号修改
|
2024-07-26 14:21:07 +08:00 |
|
wangw
|
b02b4c236c
|
密码设置
|
2024-07-26 13:58:22 +08:00 |
|
wangw
|
b8a0a14b21
|
员工管理
|
2024-07-26 09:20:56 +08:00 |
|
SongZhang
|
ae8fdd72b3
|
1.登录验证码可选
|
2024-07-25 17:40:54 +08:00 |
|
wangw
|
c7d4757c64
|
日期校验问题
|
2024-07-25 15:55:03 +08:00 |
|
牛叉闪闪
|
e9ec9a1ca5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-25 15:02:43 +08:00 |
|
牛叉闪闪
|
a381f231f8
|
交班记录
|
2024-07-25 15:02:32 +08:00 |
|
SongZhang
|
a534ffdf37
|
1.库存记录不一致问题修复
|
2024-07-25 14:06:34 +08:00 |
|
SongZhang
|
3674955224
|
1.耗材列表倒序
|
2024-07-24 14:41:23 +08:00 |
|
牛叉闪闪
|
3db2139e25
|
添加盘点备注
|
2024-07-23 15:41:38 +08:00 |
|
wangw
|
fb6f024394
|
商品单位必填
|
2024-07-23 11:22:56 +08:00 |
|
SongZhang
|
89733cdd95
|
1.库存查询接口，sku上下架字段返回
|
2024-07-23 09:17:14 +08:00 |
|
wangw
|
f6c8a0c067
|
店铺扩展数据
|
2024-07-22 13:48:06 +08:00 |
|
牛叉闪闪
|
0946c9375d
|
添加盘点备注
|
2024-07-22 11:37:31 +08:00 |
|
SongZhang
|
2a6dcf563b
|
1.sku售出记录不保存问题
2.库存条目数不一致
|
2024-07-20 17:00:39 +08:00 |
|
牛叉闪闪
|
4c153a2bfb
|
耗材记录中添加商品信息
|
2024-07-20 16:53:27 +08:00 |
|
牛叉闪闪
|
7e4299eecc
|
添加耗材记录通过店铺id
|
2024-07-20 16:02:45 +08:00 |
|
牛叉闪闪
|
4bd089e0fc
|
添加耗材记录通过店铺id
|
2024-07-20 15:17:05 +08:00 |
|
牛叉闪闪
|
946a827154
|
添加耗材单位
|
2024-07-18 17:43:17 +08:00 |
|
SongZhang
|
66c3f2ab62
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-18 14:27:15 +08:00 |
|
SongZhang
|
5943f1b72f
|
1.sku售出记录不保存问题
2.库存条目数不一致
|
2024-07-18 14:26:58 +08:00 |
|
GYJ
|
cf1f5c8688
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-17 11:25:58 +08:00 |
|
GYJ
|
34c190ced8
|
订单查询携带商品名称模糊查询
|
2024-07-17 11:25:16 +08:00 |
|
牛叉闪闪
|
762c23b08e
|
添加耗材单位
|
2024-07-17 11:12:07 +08:00 |
|
SongZhang
|
a16b2925b2
|
1.库存新增上下架接口
2.库存记录返回orderNo
3.增加保存库存记录mq处理
|
2024-07-17 09:55:23 +08:00 |
|
SongZhang
|
279057d54f
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-17 09:52:28 +08:00 |
|
韩鹏辉
|
5b31342d32
|
添加耗材单位
|
2024-07-12 13:42:48 +08:00 |
|
韩鹏辉
|
f8269e35a3
|
添加耗材单位
|
2024-07-12 11:18:19 +08:00 |
|
SongZhang
|
86c39780ee
|
耗材分类查询接口增加已绑定数量字段
|
2024-07-12 10:45:16 +08:00 |
|
韩鹏辉
|
5226b1719a
|
修改耗材代码生成规则
|
2024-07-12 09:01:33 +08:00 |
|
GYJ
|
b6df6fd74d
|
商品库存导出未带入分类参数
|
2024-07-11 18:48:38 +08:00 |
|
韩鹏辉
|
46f85fe5fb
|
修改耗材信息校验
|
2024-07-11 17:36:59 +08:00 |
|
韩鹏辉
|
c7557c9b12
|
修改耗材信息校验
|
2024-07-11 17:34:24 +08:00 |
|
韩鹏辉
|
d232e923d6
|
修改耗材信息校验
|
2024-07-11 17:24:55 +08:00 |
|
GYJ
|
9590359f13
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-11 16:59:15 +08:00 |
|
wangw
|
ed2440d2d5
|
商品 规格 编辑
|
2024-07-11 16:58:10 +08:00 |
|
韩鹏辉
|
2ed9bb48ec
|
修改耗材信息校验
|
2024-07-11 15:43:13 +08:00 |
|
SongZhang
|
134cb90a02
|
Merge remote-tracking branch 'origin/master'
|
2024-07-11 13:51:30 +08:00 |
|
SongZhang
|
bebe538e79
|
库存预警数值不展示修复
|
2024-07-11 13:51:20 +08:00 |
|
SongZhang
|
98e49a8e30
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
|
2024-07-11 13:37:04 +08:00 |
|
韩鹏辉
|
11b3af6104
|
添加发送短信,设置操作密码
|
2024-07-11 13:34:28 +08:00 |
|
韩鹏辉
|
21fb470052
|
添加发送短信
|
2024-07-11 11:35:35 +08:00 |
|
韩鹏辉
|
6a8ea3416f
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-10 18:16:17 +08:00 |
|
wangw
|
da97da3d7d
|
会员列表
|
2024-07-10 18:07:18 +08:00 |
|
GYJ
|
35312b6137
|
Merge branch 'refs/heads/dev'
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
|
2024-07-10 17:46:14 +08:00 |
|
wangw
|
713350ac3a
|
会员标识
|
2024-07-10 17:42:59 +08:00 |
|
韩鹏辉
|
7214d9d4fc
|
添加前端传递数据校验
|
2024-07-10 17:40:52 +08:00 |
|
韩鹏辉
|
90501ccfb1
|
添加前端传递数据校验
|
2024-07-10 17:40:22 +08:00 |
|
韩鹏辉
|
17cfaa2a61
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-10 17:26:06 +08:00 |
|
韩鹏辉
|
570f5611df
|
修改耗材商品批量添加
|
2024-07-10 17:25:50 +08:00 |
|
wangw
|
ad628b3d72
|
sku 逻辑删除
|
2024-07-10 17:11:02 +08:00 |
|
韩鹏辉
|
c49765c353
|
修改耗材商品批量添加
|
2024-07-10 16:18:34 +08:00 |
|
GYJ
|
8ad0274048
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-10 15:20:11 +08:00 |
|
GYJ
|
9f2f9bf59a
|
充值查询增加 scanMemberAwardIn 系统奖励
|
2024-07-10 15:19:52 +08:00 |
|
wangw
|
981671d583
|
歌曲页面 增加 歌手页地址
|
2024-07-10 14:09:26 +08:00 |
|
wangw
|
d528c4c10d
|
歌曲页面 增加 歌手页地址
|
2024-07-10 14:00:12 +08:00 |
|
GYJ
|
2efdb7d780
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-10 13:41:34 +08:00 |
|
GYJ
|
df6a41430e
|
修改查询会员充值bug
|
2024-07-10 13:37:39 +08:00 |
|
韩鹏辉
|
f23fa44c57
|
修改耗材商品批量添加
|
2024-07-10 11:08:10 +08:00 |
|
GYJ
|
b3194b83dc
|
修复查询会员充值金额bug
|
2024-07-10 10:12:21 +08:00 |
|
GYJ
|
27c8cb1959
|
Merge branch 'refs/heads/dev'
|
2024-07-10 09:27:25 +08:00 |
|
GYJ
|
d5a5332e78
|
Merge branch 'refs/heads/dev'
|
2024-07-10 09:08:43 +08:00 |
|
wangw
|
01d7327be6
|
Merge branch 'gyj' into dev
|
2024-07-09 16:13:12 +08:00 |
|
GYJ
|
a09a46e0ea
|
查询导出充值记录
|
2024-07-09 16:04:25 +08:00 |
|
韩鹏辉
|
a5cea4293f
|
添加订单台桌字段
|
2024-07-09 16:02:38 +08:00 |
|
SongZhang
|
370fe409f6
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-09 15:55:30 +08:00 |
|
wangw
|
5c960ec661
|
歌手页
|
2024-07-09 15:29:31 +08:00 |
|
wangw
|
abc13bcf69
|
歌曲订单管理
|
2024-07-09 15:17:30 +08:00 |
|
SongZhang
|
f55f38a8fe
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-09 11:48:46 +08:00 |
|
韩鹏辉
|
8ad974bfa4
|
修改批量出入库
|
2024-07-09 11:10:09 +08:00 |
|
韩鹏辉
|
c06c4cb867
|
修改批量出入库
|
2024-07-09 10:57:10 +08:00 |
|
SongZhang
|
c86e28a363
|
Merge remote-tracking branch 'origin/zs'
|
2024-07-09 10:54:12 +08:00 |
|
韩鹏辉
|
497d0a7b12
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
|
2024-07-09 10:51:55 +08:00 |
|
韩鹏辉
|
90bfde259c
|
修改批量出入库
|
2024-07-09 10:50:30 +08:00 |
|
GYJ
|
507b4d4d9e
|
处理没有订单是台桌信息为空
|
2024-07-09 10:38:05 +08:00 |
|
SongZhang
|
faadcea62b
|
修复会员查询余额不准确问题
|
2024-07-09 10:36:23 +08:00 |