From fe98a636e22b93662607e80ea4314215b0dd36a6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 09:23:12 +0800
Subject: [PATCH] 代码合并

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java |    2 +-
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppCouponMapper.xml                                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 0692cd9..2823142 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
@@ -43,13 +43,13 @@
                 AND  t2.phone LIKE concat('%',#{req.phone}, '%')
             </if>
             <if test="req.status != null and req.status = 1">
-                AND t1.status =1 and t1.endTime &gt;= now()
+                AND t1.status =1 and t1.end_time &gt;= now()
             </if>
             <if test="req.status != null and req.status = 2">
                 AND t1.status =2
             </if>
             <if test="req.status != null and req.status = 3">
-                AND t1.status =1 and t1.endTime &lt;= now() and t1.del_flag = 0
+                AND t1.status =1 and t1.end_time &lt;= now() and t1.del_flag = 0
             </if>
             <if test="req.status != null and req.status = 4">
                 AND t1.del_flag = 0
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 1d259d8..f9e97dc 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -69,7 +69,7 @@
 
 
     @ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "导出")
-    @PostMapping(value = "/export")
+    @PutMapping(value = "/export")
     public R export() {
             return R.ok();
     }

--
Gitblit v1.7.1