From c4c599a2a5ba8bafec5d6171be009599be004c58 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 八月 2024 17:11:37 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java | 2 +-
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java
index 2fe11fb..367075c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/carBrand/SSLCipherSuiteUtil.java
@@ -14,7 +14,7 @@
import org.openeuler.BGMProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import okhttp3.OkHttpClient;
+import shade.okhttp3.OkHttpClient;
import javax.net.ssl.*;
import java.net.HttpURLConnection;
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
index 2823142..7942bc2 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml
@@ -71,10 +71,10 @@
t1.del_flag = 0
AND t1.app_user_id = #{userId}
AND t1.status = 1
- and t1.endTime >= now()
+ and t1.end_time >= now()
GROUP BY
- t1.coupon_id,
- t1.end_time
+ t1.app_user_id,
+ t1.coupon_id
</select>
</mapper>
--
Gitblit v1.7.1