From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserApplyForAdmissionServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserApplyForAdmissionServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserApplyForAdmissionServiceImpl.java
index 0340d78..c576dfe 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserApplyForAdmissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserApplyForAdmissionServiceImpl.java
@@ -131,6 +131,7 @@
//审核通过
apply.setStatus(1);
apply.setUpdateTime(LocalDateTime.now());
+ apply.setRemark(applyReviewDTO.getRemark());
this.updateById(apply);
//先加入商店
@@ -155,7 +156,7 @@
Phone phone = new Phone();
phone.setType(2);//门店
phone.setPhoneOne(apply.getServiceTel());
- phone.setShopId(shop.getId());
+ phone.setShopId(shopId);
R phoneR = phoneClient.insert(phone);
if (phoneR.getCode()!=200){
throw new RuntimeException("添加店铺客服电话失败");
--
Gitblit v1.7.1