牛叉闪闪
|
2f1f8877fc
|
添加是否允许用户自定义充值金额字段
|
2024-08-19 17:51:45 +08:00 |
|
牛叉闪闪
|
be842bc1f6
|
Merge remote-tracking branch 'origin/test' into hph
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
|
2024-08-19 17:47:34 +08:00 |
|
牛叉闪闪
|
5cdc276b0c
|
添加是否允许用户自定义充值金额字段
|
2024-08-19 17:36:55 +08:00 |
|
|
|
a11dcb5811
|
Merge branch 'dev' into test
|
2024-08-19 17:26:01 +08:00 |
|
牛叉闪闪
|
31a5c94adf
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-08-19 17:13:29 +08:00 |
|
|
|
9b868838f4
|
1.公众号订阅新增type类型
|
2024-08-19 17:13:22 +08:00 |
|
GYJ
|
22c04c61f5
|
小程序获取弹窗接口
|
2024-08-19 15:30:14 +08:00 |
|
|
|
952a618175
|
shopId undefined 返回信息
|
2024-08-16 15:31:07 +08:00 |
|
|
|
b435420d97
|
Merge branch 'test' into dev
|
2024-08-16 15:22:31 +08:00 |
|
|
|
82b4f773e4
|
shopUser返回 店铺经纬度 及 地址
|
2024-08-16 14:28:43 +08:00 |
|
|
|
370f5c1b60
|
Merge branch 'ww' into test
|
2024-08-16 14:12:19 +08:00 |
|
|
|
605b1778a4
|
会员和用户手机号 保持一致
|
2024-08-16 14:07:01 +08:00 |
|
|
|
09768ef42c
|
Merge branch 'ww' into test
|
2024-08-16 09:28:14 +08:00 |
|
|
|
878cc895d4
|
商品 可售时间 分组 排序
会员信息 返回头像
|
2024-08-16 09:27:58 +08:00 |
|
|
|
4b4394d070
|
Merge branch 'ww' into test
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
|
2024-08-14 16:10:22 +08:00 |
|
|
|
48a6628acb
|
商品 可售时间 处理 商品级
|
2024-08-14 16:07:38 +08:00 |
|
|
|
a4601fac99
|
商品 可售时间 处理
|
2024-08-14 15:32:50 +08:00 |
|
|
|
57472bdf00
|
开通会员接口
|
2024-08-14 15:32:50 +08:00 |
|
|
|
9a70d68d37
|
Merge remote-tracking branch 'origin/zs' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
|
2024-08-14 14:57:23 +08:00 |
|
|
|
8ea20b8394
|
1.避免重复消息推送
|
2024-08-14 14:56:39 +08:00 |
|
|
|
dae3a75e0c
|
1.避免重复消息推送
|
2024-08-14 13:56:34 +08:00 |
|
|
|
efd0d80dc3
|
1.消息推送校验店铺状态
|
2024-08-14 13:56:34 +08:00 |
|
|
|
3ab1629436
|
1.消息推送修改
|
2024-08-14 13:56:29 +08:00 |
|
|
|
68d12fe2ed
|
商品 可售时间 处理
|
2024-08-14 11:34:51 +08:00 |
|
|
|
a9b32b4e57
|
1.避免重复消息推送
|
2024-08-14 09:55:18 +08:00 |
|
|
|
8281c2b9bc
|
开通会员接口
|
2024-08-14 09:46:28 +08:00 |
|
|
|
bee86bbb73
|
1.消息推送校验店铺状态
|
2024-08-13 09:44:39 +08:00 |
|
|
|
538fc8f91b
|
1.消息推送fix
|
2024-08-09 16:45:53 +08:00 |
|
|
|
dc291231ee
|
1.消息推送修改
|
2024-08-09 16:42:17 +08:00 |
|
|
|
7f8a658143
|
1.下架规格未查询出修复
|
2024-08-09 14:37:53 +08:00 |
|
|
|
f4af3a279f
|
店铺信息不存在
|
2024-08-08 16:57:24 +08:00 |
|
|
|
a789eea6b0
|
商品列表 不展示 套餐商品
|
2024-08-08 15:08:57 +08:00 |
|
|
|
a6fc82c4cb
|
销量
|
2024-08-08 10:44:13 +08:00 |
|
|
|
6ee7b54311
|
1.消息订阅同步保存昵称头像
2.小程序规格获取
|
2024-08-08 10:36:39 +08:00 |
|
|
|
fbabdc5763
|
1.新增商品规格获取接口
2.多规格上下架实现
|
2024-08-06 14:49:07 +08:00 |
|
|
|
3e32ea31d3
|
Merge remote-tracking branch 'origin/dev'
|
2024-08-05 16:11:54 +08:00 |
|
|
|
ae5bc911fa
|
扫码点餐部分 商品循环数据问题
|
2024-08-05 15:10:48 +08:00 |
|
|
|
4c71d54ec4
|
扫码点餐部分
|
2024-08-05 14:19:57 +08:00 |
|
|
|
cf62b19179
|
扫码点餐部分
|
2024-08-05 11:40:49 +08:00 |
|
|
|
ccf9d6a01b
|
Merge remote-tracking branch 'origin/dev'
|
2024-08-05 11:26:41 +08:00 |
|
|
|
5ad0eea854
|
1.修改订阅二维码生成参数
|
2024-08-05 09:51:33 +08:00 |
|
|
|
567a5a0e23
|
1.公众号订阅新增type类型
|
2024-08-02 10:59:53 +08:00 |
|
牛叉闪闪
|
0f4d9f0127
|
Merge remote-tracking branch 'origin/master' into hph
|
2024-08-02 10:07:11 +08:00 |
|
牛叉闪闪
|
cbae826ce2
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-08-02 10:06:38 +08:00 |
|
GYJ
|
ad5cd56596
|
商品库存库存开关按钮关闭，库存不足不给推送
|
2024-07-30 11:34:14 +08:00 |
|
GYJ
|
bd9d3f0eea
|
替换logo图片
|
2024-07-29 16:01:33 +08:00 |
|
GYJ
|
6a29563de0
|
替换logo图片
|
2024-07-29 14:55:21 +08:00 |
|
|
|
b3fc438e78
|
1.二维码增加ysk logo
2.耗材预警调整
|
2024-07-26 17:04:55 +08:00 |
|
|
|
63c97b781e
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-26 10:19:34 +08:00 |
|
|
|
95f529e4d7
|
1.耗材推送预警值改为等于
2. 耗材数量为消耗完毕数量
|
2024-07-26 10:11:38 +08:00 |
|
