gaowdong
|
c8a7c14cf7
|
Merge remote-tracking branch 'origin/master'
|
2025-02-14 09:24:01 +08:00 |
|
gaowdong
|
93d35c4fb7
|
删除 cust-auth
|
2025-02-14 09:23:54 +08:00 |
 tqzhang
|
b928929990
|
upby修改 删除多余的AccSendMq.java
|
2025-02-14 09:21:56 +08:00 |
 sxu
|
afb72d28db
|
配置文件
|
2025-02-13 18:39:35 +08:00 |
|
gaowdong
|
20bf3c186a
|
Merge remote-tracking branch 'origin/master'
|
2025-02-13 17:34:24 +08:00 |
|
gaowdong
|
efa1e480fd
|
新增 mq
|
2025-02-13 17:34:14 +08:00 |
 liux
|
e52483d06b
|
我的地址
|
2025-02-13 15:36:07 +08:00 |
|
liux
|
bd40579509
|
Merge remote-tracking branch 'origin/master'
|
2025-02-13 15:28:21 +08:00 |
|
sxu
|
ea8ab22056
|
共享驿站
|
2025-02-13 15:11:16 +08:00 |
|
sxu
|
23e2ee1e76
|
共享驿站
|
2025-02-13 14:43:55 +08:00 |
|
liux
|
560edb6611
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java
# bonus-cust-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v4/web/service/CardInfoV4Service.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/DelayedMessageSender.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/manage/dto/DeviceMqPersonalUpdateMessageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/mq/MacMessage.java
|
2025-02-13 14:29:38 +08:00 |
|
sxu
|
5edb16da00
|
删除cust-auth
|
2025-02-13 13:37:27 +08:00 |
|
tqzhang
|
e174b0ece0
|
customer-data-change-delay 消息推送
|
2025-02-13 13:36:45 +08:00 |
|
tqzhang
|
2abf460e5b
|
mq消息推送
|
2025-02-13 10:58:39 +08:00 |
|
gaowdong
|
bca90e0c44
|
MQ提交
|
2025-02-13 10:09:36 +08:00 |
|
sxu
|
21909c195e
|
Merge remote-tracking branch 'origin/master'
|
2025-02-13 09:53:44 +08:00 |
|
sxu
|
6244f902aa
|
id fix
|
2025-02-13 09:53:35 +08:00 |
|
tqzhang
|
0a7d96d57e
|
移动端卡片管理 - web端卡片管理--/api/v4/app/custInfo/card/list
|
2025-02-13 09:27:45 +08:00 |
|
sxu
|
af1868c2c5
|
编译问题
|
2025-02-13 09:18:41 +08:00 |
|
tqzhang
|
43ebd8c5ee
|
小程序保存人脸图片 -- upby修改
|
2025-02-12 17:27:15 +08:00 |
|
liux
|
20c99188c6
|
Merge remote-tracking branch 'origin/master'
|
2025-02-12 17:08:23 +08:00 |
|
liux
|
035d270c73
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mq/send/model/AccStatusChangeModel.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/constant/LeMqConstant.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/encrypt/SM4EncDecHandler.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/constants/FeaturesBuildStatusEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/constants/PersonalSexEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustInfoDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustPayDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustAccTempMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAccTemp.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/CustomerMessageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/DelayedMessageSender.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustAccTempService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoBusiness.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustAccTempServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/vo/CustPayVO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/door/api/DcPushUserDataServiceApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/starter/threadpool/CleanTenantIdTaskDecorator.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustCasualMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
|
2025-02-12 17:07:42 +08:00 |
|
tqzhang
|
22cfb63c8c
|
TenantContextHolder相关配置
|
2025-02-12 17:03:26 +08:00 |
|
liux
|
b7bf685daf
|
基本信息（保存）
|
2025-02-12 16:49:09 +08:00 |
|
tqzhang
|
dfec21bbd6
|
base64图片上传
|
2025-02-12 16:48:02 +08:00 |
|
tqzhang
|
7c8e5eb3b0
|
小程序保存人脸图片--/custInfo/uploadPhotoGenCodeForApp
|
2025-02-12 15:32:28 +08:00 |
|
sxu
|
b3bde0a6fd
|
fix conflict
|
2025-02-12 12:50:01 +08:00 |
|
sxu
|
a6b61982a2
|
菜谱详情
|
2025-02-12 12:48:10 +08:00 |
|
sxu
|
adad04a9e3
|
菜谱详情
|
2025-02-12 11:20:30 +08:00 |
|
sxu
|
b9fd718813
|
菜谱详情
|
2025-02-12 11:16:34 +08:00 |
|
tqzhang
|
a24b568419
|
用户获取通知消息
获取未读消息数量
修改通知状态
|
2025-02-12 10:53:22 +08:00 |
|
tqzhang
|
f97183cfee
|
配置page分页
|
2025-02-12 09:21:02 +08:00 |
|
tqzhang
|
924c1b1c0b
|
充值超时重新查询充值结果--/recharge/overtime/query-result
|
2025-02-11 20:40:25 +08:00 |
|
tqzhang
|
9803cafd9b
|
充值接口--暂时可启动
|
2025-02-11 19:44:14 +08:00 |
skjia
|
45dc63c59e
|
jsk 预定餐
预订餐（档口列表）
预订餐（详情）
移动端-查询预订详情
移动端-获取订单详情
移动端-预订餐（加购物车
移动端-预订餐（减购物车）
|
2025-02-11 18:52:37 +08:00 |
|
sxu
|
ac6ca0ea87
|
菜谱详情
|
2025-02-11 16:47:55 +08:00 |
|
sxu
|
22ab137bc6
|
菜谱详情
|
2025-02-11 16:40:02 +08:00 |
|
sxu
|
dd29e8c6f5
|
菜谱详情
|
2025-02-11 16:23:45 +08:00 |
|
sxu
|
2190167436
|
token fix
|
2025-02-11 16:02:47 +08:00 |
|
gaowdong
|
1c30938d6f
|
评价投诉建议
|
2025-02-11 15:59:01 +08:00 |
|
gaowdong
|
aca5728e02
|
订单-评价
|
2025-02-10 18:29:28 +08:00 |
|
sxu
|
a196e442bd
|
deploy scripts
|
2025-02-10 12:42:18 +08:00 |
|
sxu
|
93af56cfe8
|
Revert "jsk 预订餐"
This reverts commit 0bfc6b84b5.
|
2025-02-10 09:11:20 +08:00 |
|
sxu
|
8e34480b8f
|
Revert "jsk 预定餐"
This reverts commit 908dbaaef0.
|
2025-02-10 09:11:14 +08:00 |
|
sxu
|
7caed5fd1f
|
Revert "jsk"
This reverts commit 01d585d440.
|
2025-02-10 09:11:11 +08:00 |
|
skjia
|
01d585d440
|
jsk
|
2025-02-10 09:06:49 +08:00 |
|
skjia
|
908dbaaef0
|
jsk 预定餐
|
2025-02-10 09:05:32 +08:00 |
|
skjia
|
0bfc6b84b5
|
jsk 预订餐
|
2025-02-10 08:53:25 +08:00 |
|
gaowdong
|
640deb2c8f
|
Jackson 序列化修改
|
2025-02-08 16:54:26 +08:00 |
|
tqzhang
|
df6e52ce15
|
Json序列化
|
2025-02-08 15:40:24 +08:00 |