合并代码

puzhibing

2024-08-26 c4c599a2a5ba8bafec5d6171be009599be004c58

合并代码

 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;

 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>