Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2026-03-02 5978c89e996a2234c3d2ab56a3f4d5b7c6165536

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMicroWishController.java

@@ -32,6 +32,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;

@@ -102,6 +103,7 @@
        microWishService.update(Wrappers.lambdaUpdate(TMicroWish.class)
                .set(TMicroWish::getStatus, dto.getStatus())
                .set(TMicroWish::getAuditRemark, dto.getAuditRemark())
                .set(TMicroWish::getProcessTime, LocalDateTime.now())
                .eq(TMicroWish::getId, dto.getId()));
        return R.ok();
    }
@@ -117,6 +119,7 @@
                .set(TMicroWish::getStatus, dto.getStatus())
                .set(TMicroWish::getProcessResult, dto.getProcessResult())
                .set(TMicroWish::getProcessPictures, dto.getProcessPictures())
                .set(TMicroWish::getProcessTime, LocalDateTime.now())
                .eq(TMicroWish::getId, dto.getId()));
        return R.ok();
    }

 ruoyi-applet/src/main/resources/application.yml

@@ -1,4 +1,4 @@
# 项目相关配置
spring:
  profiles:
    active: test
    active: prod