|
|
6ef9a10639
|
Merge remote-tracking branch 'origin/hph' into dev
|
2024-07-05 14:22:42 +08:00 |
|
韩鹏辉
|
4d526525a5
|
添加耗材警告
|
2024-07-05 14:22:21 +08:00 |
|
韩鹏辉
|
d772c63ee5
|
添加耗材警告
|
2024-07-05 10:20:09 +08:00 |
|
|
|
2b086ef923
|
日志输出为 cashier-client.log
10MB 进行一次存储
|
2024-07-05 09:58:52 +08:00 |
|
韩鹏辉
|
781a4baa81
|
添加耗材警告
|
2024-07-03 14:52:25 +08:00 |
|
|
|
e31f3c831a
|
库存预警支持多账号订阅
|
2024-07-02 16:13:24 +08:00 |
|
GYJ
|
286b9af051
|
mapper参数写错
|
2024-06-29 09:30:28 +08:00 |
|
韩鹏辉
|
8f4afed929
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-06-28 18:00:00 +08:00 |
|
韩鹏辉
|
4e27eb87b5
|
修改耗材库存
|
2024-06-28 17:59:41 +08:00 |
|
|
|
d82387e9d1
|
新增下单库存预警消息推送
|
2024-06-28 14:15:42 +08:00 |
|
韩鹏辉
|
fad761b63c
|
修改耗材库存
|
2024-06-28 09:39:29 +08:00 |
|
韩鹏辉
|
75ec8fc9e5
|
修改耗材库存
|
2024-06-28 09:39:14 +08:00 |
|
|
|
e91636a188
|
分页配置统一
|
2024-06-27 14:21:46 +08:00 |
|
韩鹏辉
|
abc5ea04e4
|
Merge branch '1.0.1' into dev
|
2024-06-26 14:28:36 +08:00 |
|
GYJ
|
bd0054ffa8
|
Merge branch 'refs/heads/stock-share' into dev
|
2024-06-26 09:18:57 +08:00 |
|
韩鹏辉
|
82935827f5
|
修改打印
|
2024-06-25 15:08:46 +08:00 |
|
韩鹏辉
|
4f6cd81505
|
修改打印
|
2024-06-25 14:54:07 +08:00 |
|
韩鹏辉
|
8fc41c1b07
|
修改库存
|
2024-06-25 09:58:47 +08:00 |
|
韩鹏辉
|
86bdcbe3c5
|
修改库存
|
2024-06-25 09:58:21 +08:00 |
|
GYJ
|
b66a89b143
|
退款回滚库存
|
2024-06-24 18:00:25 +08:00 |
|
GYJ
|
fa2668ed1c
|
添加字段
|
2024-06-24 15:05:26 +08:00 |
|
GYJ
|
c1790a3198
|
memberIn 增加shopId merchantId
|
2024-06-20 15:19:03 +08:00 |
|
|
|
f4d177609c
|
新增接口 分类列表(包括子分类)
|
2024-06-20 13:34:42 +08:00 |
|
|
|
762a902950
|
新增接口 分类列表(包括子分类)
|
2024-06-20 11:57:02 +08:00 |
|
韩鹏辉
|
d46d4ca6df
|
修改库存
|
2024-06-19 17:27:38 +08:00 |
|
韩鹏辉
|
5b97722699
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
# src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
# src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
# src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
# src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
# src/main/resources/generator-mapper/generatorConfig.xml
|
2024-06-19 16:46:27 +08:00 |
|
韩鹏辉
|
50fa846cf1
|
修改库存
|
2024-06-19 16:44:11 +08:00 |
|
韩鹏辉
|
90a8fd4a54
|
添加类型
|
2024-06-14 15:28:13 +08:00 |
|
韩鹏辉
|
c50172f5ca
|
修改库存
|
2024-06-12 10:12:58 +08:00 |
|
韩鹏辉
|
a1764e77c6
|
修改库存
|
2024-06-12 10:03:09 +08:00 |
|
|
|
21008fd918
|
会员新建关联
会员支付金额校验
团购卷退款订单号
|
2024-06-04 09:15:42 +08:00 |
|
韩鹏辉
|
70b29bd3ff
|
修改会员添加报错
|
2024-05-31 15:16:24 +08:00 |
|
韩鹏辉
|
689db4cf1b
|
修改交班数据
|
2024-05-30 16:51:49 +08:00 |
|
韩鹏辉
|
92df7d1ba6
|
修改交班数据
|
2024-05-30 11:21:05 +08:00 |
|
韩鹏辉
|
9482cf4597
|
修改交班数据
|
2024-05-29 16:00:12 +08:00 |
|
韩鹏辉
|
664e57e145
|
添加会员充值奖励
|
2024-05-29 10:38:36 +08:00 |
|
|
|
640036afc5
|
退款回调
|
2024-05-24 15:58:28 +08:00 |
|
|
|
3e6cb81b46
|
购物车 多规格商品返回规格信息
团购卷列表
团购卷退款
员工登录管理
|
2024-05-24 15:56:41 +08:00 |
|
韩鹏辉
|
c5e337bef3
|
修改支付
|
2024-05-20 17:44:19 +08:00 |
|
韩鹏辉
|
cd913643a5
|
添加快捷支付
|
2024-05-20 09:59:15 +08:00 |
|
韩鹏辉
|
9b441ba636
|
添加新版收银系统支付
|
2024-05-17 10:52:22 +08:00 |
|
韩鹏辉
|
e64bce5e93
|
添加新版收银系统支付
|
2024-05-17 10:51:30 +08:00 |
|
wangguocheng
|
09e9b172ee
|
商品查询修改
|
2024-05-17 10:48:36 +08:00 |
|
wangguocheng
|
168d9c8a43
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/generator-mapper/generatorConfig.xml
|
2024-05-17 10:31:29 +08:00 |
|
wangguocheng
|
1c6ccb7d10
|
商品查询修改
|
2024-05-17 10:28:43 +08:00 |
|
韩鹏辉
|
bdce57ca44
|
添加新版收银系统支付
|
2024-05-16 14:21:55 +08:00 |
|
韩鹏辉
|
9f8fbe4850
|
修改支付通道问题
|
2024-04-16 11:19:17 +08:00 |
|
韩鹏辉
|
c0f3b445cb
|
修改打印数据
|
2024-04-15 15:33:18 +08:00 |
|
19991905653
|
a2432316ea
|
交班打印逻辑修改
|
2024-04-12 10:27:51 +08:00 |
|
19991905653
|
c3c169d2b5
|
交班修改业务逻辑 ，跨天统计
|
2024-04-11 15:21:52 +08:00 |
|
