liwei19941102 пре 2 година
родитељ
комит
da347b5ccf

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/TblUserVacate.java

@@ -47,7 +47,7 @@ public class TblUserVacate extends BaseEntity {
     /**
      * 内容描述
      */
-    private String desc;
+    private String des;
 
     /**
      * 状态( 1-通过  2-拒绝  0-待处理)

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblUserVacateBo.java

@@ -45,7 +45,7 @@ public class TblUserVacateBo extends BaseEntity {
     /**
      * 内容描述
      */
-    private String desc;
+    private String des;
 
     /**
      * 状态( 1-通过  2-拒绝  0-待处理)

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblUserVacateVo.java

@@ -58,7 +58,7 @@ public class TblUserVacateVo implements Serializable {
      * 内容描述
      */
     @ExcelProperty(value = "内容描述")
-    private String desc;
+    private String des;
 
     /**
      * 状态( 1-通过  2-拒绝  0-待处理)

+ 1 - 1
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblUserVacateServiceImpl.java

@@ -64,7 +64,7 @@ public class TblUserVacateServiceImpl implements ITblUserVacateService {
         lqw.eq(StringUtils.isNotBlank(bo.getUserInfo()), TblUserVacate::getUserInfo, bo.getUserInfo());
         lqw.eq(bo.getStartDate() != null, TblUserVacate::getStartDate, bo.getStartDate());
         lqw.eq(bo.getEndDate() != null, TblUserVacate::getEndDate, bo.getEndDate());
-        lqw.eq(StringUtils.isNotBlank(bo.getDesc()), TblUserVacate::getDesc, bo.getDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getDes()), TblUserVacate::getDes, bo.getDes());
         lqw.eq(bo.getStatus() != null, TblUserVacate::getStatus, bo.getStatus());
         lqw.eq(bo.getCTime() != null, TblUserVacate::getCTime, bo.getCTime());
         lqw.eq(bo.getUTime() != null, TblUserVacate::getUTime, bo.getUTime());