gaowdong
|
4a6b44d2cb
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Smart-Canteen
|
2025-02-21 09:36:29 +08:00 |
|
gaowdong
|
9871846e56
|
与订餐-退单
|
2025-02-20 17:13:18 +08:00 |
skjia
|
7fa5b3d685
|
jsk getReserveMealCanteenList 修正
|
2025-02-20 15:14:34 +08:00 |
 sxu
|
ac0a15597c
|
去掉多余属性
|
2025-02-20 14:17:17 +08:00 |
|
sxu
|
244755f7ce
|
配置文件
|
2025-02-20 13:10:58 +08:00 |
 liux
|
7e8f5f94a5
|
Merge remote-tracking branch 'origin/master'
|
2025-02-20 13:02:39 +08:00 |
|
liux
|
c842763898
|
问题修改
|
2025-02-20 13:02:10 +08:00 |
|
gaowdong
|
009ca9e264
|
与订餐 提交
|
2025-02-20 11:22:21 +08:00 |
|
sxu
|
d7466b96a3
|
Merge branch 'master' into coupon
|
2025-02-20 09:39:04 +08:00 |
 tqzhang
|
22af9f8815
|
驿站：保存头像
|
2025-02-20 09:31:39 +08:00 |
|
tqzhang
|
901bac13f1
|
驿站：工具分享、多文件整理命名等
|
2025-02-20 09:07:01 +08:00 |
|
sxu
|
87ecfc0a02
|
账户相关
|
2025-02-19 20:41:29 +08:00 |
|
sxu
|
c1a51266a3
|
获取订单评价数量
|
2025-02-19 18:54:42 +08:00 |
|
sxu
|
8c29099148
|
获取订单评价数量
|
2025-02-19 18:39:36 +08:00 |
|
tqzhang
|
645348d7c9
|
分页修改
|
2025-02-18 11:19:05 +08:00 |
|
tqzhang
|
91e25c8df9
|
分页修改
|
2025-02-18 11:06:56 +08:00 |
|
sxu
|
294ce9f416
|
rebind mobile
|
2025-02-16 19:44:12 +08:00 |
|
sxu
|
7128d05a28
|
source type and rebind mobile
|
2025-02-16 16:38:44 +08:00 |
|
sxu
|
9a1700fb00
|
source type and rebind mobile
|
2025-02-16 16:22:26 +08:00 |
|
sxu
|
35f8f2db07
|
Merge remote-tracking branch 'origin/master'
|
2025-02-14 17:28:41 +08:00 |
|
sxu
|
e4aa18b85d
|
add openid
|
2025-02-14 17:28:33 +08:00 |
|
tqzhang
|
7a2eccc5de
|
删除controller的try-catch
|
2025-02-14 17:24:05 +08:00 |
|
liux
|
f6282bfeab
|
基本信息（保存）
|
2025-02-14 15:50:57 +08:00 |
|
sxu
|
2c514a177d
|
add openid
|
2025-02-14 15:44:52 +08:00 |
|
gaowdong
|
cabf317f74
|
Merge remote-tracking branch 'origin/master'
|
2025-02-14 14:58:54 +08:00 |
|
gaowdong
|
b5224726ce
|
移除rabbit mq消费消息
|
2025-02-14 14:58:47 +08:00 |
|
sxu
|
251b75b44a
|
去掉重复sql
|
2025-02-14 13:04:24 +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
|
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 |
|
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 |
|
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 |