Commit Graph

11 Commits

Author SHA1 Message Date
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
liux b7bf685daf 基本信息(保存) 2025-02-12 16:49:09 +08:00
tqzhang f97183cfee 配置page分页 2025-02-12 09:21:02 +08:00
sxu 2190167436 token fix 2025-02-11 16:02:47 +08:00
liux 3d254fa734 我的信息模块代码 2025-02-08 11:11:12 +08:00
gaowdong 03cde7f590 修改 Id.next() 以及springcontextholer 2025-02-08 09:06:15 +08:00
tqzhang fca5072fac 获取指定餐品的评价列表 api/v1/applet/menuevaluaorder/page/meal 2025-02-07 16:56:21 +08:00
tqzhang 279d2fe5cc 配置文件 2025-02-05 19:08:41 +08:00
tqzhang bc0f0ec174 /api/v2/acc/metadata/query 余额查询-查询配置 2025-02-05 16:59:54 +08:00
sxu 7c3e23bc9b pwd 2025-02-05 10:37:12 +08:00
sxu b6e2d65329 合并客户登录 2025-02-03 21:00:07 +08:00