后端框架第一版接口

demo/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.6</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java

@@ -51,10 +51,10 @@ public interface ActivityMapper {
             "select activity.*,admin.name from activity",
             "inner join admin on activity.admin_id=admin.admin_id ",
             "<where>",
+            "`activity_flag`=1",
             "<if test='startTime!=null'>start_time=#{startTime}</if>",
             "<if test='endTime!=null'>and end_time=#{endTime}</if>",
             "<if test='activityName!=null'>and activity_name like concat('%','#{activityName}','%')</if>",
-            "<if test='flag!=null'>and flag=1)</if>",
             "</where>",
             "</script>"
 

demo/recharge/src/main/java/com/example/recharge/service/RechargeServiceImpl.java

@@ -4,6 +4,7 @@ import com.example.commons.domain.entity.Recharge;
 import com.example.commons.domain.vo.RechargeVo;
 import com.example.commons.sevice.RechargeService;
 import com.example.recharge.mapper.RechargeMapper;
+
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;