abai il y a 4 jours
Parent
commit
4d960987bb

+ 0 - 5
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShipCompany.java

@@ -60,11 +60,6 @@ public class BjTrackShipCompany extends BaseEntity {
     private String dateSource;
 
     /**
-     * 列入日期
-     */
-    private Date addDate;
-
-    /**
      * 列入开始日期
      */
     private Date addStartDate;

+ 1 - 2
ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipCompanyVo.java

@@ -59,8 +59,7 @@ public class BjTrackShipCompanyVo implements Serializable {
     /**
      * 列入日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date addDate;
+    private String addDate;
 
     /**
      * 发布日期

+ 1 - 1
ruoyi-modules/ruoyi-business/src/main/resources/mapper/business/BjTrackShipCompanyMapper.xml

@@ -24,7 +24,7 @@
                ships,
                status,
                date_source,
-               add_date,
+               concat(date_format(add_start_date,'%Y-%m-%d'), '/', date_format(add_end_date,'%Y-%m-%d')) as add_date,
                release_date,
                file,
                release_flag