广告计划管理多返回一个广告名称字段；修复bug

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/CallBackBean.java

@@ -1,13 +1,9 @@
 package com.ruoyi.demo.entity.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -18,7 +14,5 @@ public class CallBackBean {
     private String auditComment;  //信息
 
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanManageListVo.java

@@ -11,6 +11,7 @@ import java.util.Date;
 @Data
 public class PlanManageListVo {
     private String planId;
+    private String planName;
     private String appName;
     private String goodsImg;
     private String goodsName;
@@ -30,6 +31,7 @@ public class PlanManageListVo {
     public PlanManageListVo(){}
     public PlanManageListVo(Plan plan){
         this.planId = plan.getPlanId();
+        this.planName = plan.getPlanName();
         this.commercialName = plan.getCommercialName();
         this.appName = plan.getAppName();
         this.goodsImg = plan.getGoodsImg();

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -316,6 +316,8 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.and(planQueryWrapper1 -> {
                 planQueryWrapper1/*.like("plan_id",bo.getText())
                     .or()*/
+                    .like("plan_name", bo.getText())
+                    .or()
                     .like("app_name", bo.getText())
                     .or()
                     .like("commercial_name", bo.getText());
@@ -325,6 +327,7 @@ public class PlanServiceImpl implements PlanService {
         if (bo.getEndTime() != null)
             planQueryWrapper.apply("plan_end_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
         planQueryWrapper.eq("deleted", "0");
+
         Page<Plan> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         List<Plan> plans = planMapper.selectPage(page, planQueryWrapper).getRecords();
         List<PlanManageListVo> vos = new ArrayList<>();