Ver código fonte

徐明浩
特种设备-叉车、电梯、起重机械-定期检验结论放置在报告编号后

徐明浩 3 anos atrás
pai
commit
df4adedb88

+ 4 - 4
master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevCc.java

@@ -123,14 +123,14 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "报告编号")
     private String reportNo;
 
-    /** 资产归属形式 */
-    @Excel(name = "资产归属形式")
-    private String assetOwner;
-
     /** 定期检验结论 */
     @Excel(name = "定期检验结论")
     private String perTestConclusion;
 
+    /** 资产归属形式 */
+    @Excel(name = "资产归属形式")
+    private String assetOwner;
+
     /** 备注 */
     //@Excel(name = "备注")
     private String remarks;

+ 4 - 4
master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -94,15 +94,15 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "报告编号")
     private String reportNo;
 
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
+
     /** 下次年检时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextWarnDate;
 
-    /** 定期检验结论 */
-    @Excel(name = "定期检验结论")
-    private String perTestConclusion;
-
     /** 备注 */
     //@Excel(name = "备注")
     private String remarks;