From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index 003cc29..67034b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -9,10 +9,13 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSONObject;
 import com.panzhihua.applets.config.MinioUtil;
 import com.panzhihua.applets.umf.UmfPayUtil;
 import com.panzhihua.applets.unionpay.*;
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
 import com.panzhihua.common.model.vos.community.Base64File;
 import com.panzhihua.common.utlis.*;
 import net.coobird.thumbnailator.Thumbnails;

--
Gitblit v1.7.1