Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbTypeMapper.java

@@ -1,10 +1,8 @@
 package com.platform.dao.mapper.sb;
 
 import com.platform.dao.config.MyMapper;
-import com.platform.dao.dto.sb.SbModelDTO;
 import com.platform.dao.dto.sb.SbTypeDTO;
 import com.platform.dao.entity.sb.SbType;
-import com.platform.dao.vo.sb.SbModelVO;
 import com.platform.dao.vo.sb.SbTypeVO;
 import org.springframework.stereotype.Component;
 

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -177,8 +177,6 @@ public class ExportSbInfoVO implements Serializable {
     @Excel(name="安装位置")
     private String cph;
 
-    @Excel(name="排序字段")
-    private String sortNum;
     /**
      * 介质
      */
@@ -240,5 +238,7 @@ public class ExportSbInfoVO implements Serializable {
     private String bcrl;
     @Excel(name="电缆规格",styleType=1)
     private String dlgg;
+    @Excel(name="排序字段")
+    private String sortNum;
 
 }

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -82,7 +82,7 @@ scrap_user_name
     </sql>
 
     <sql id="Left_Column">
-        sb.id, sb.no,
+        sb.id, sb.no,sb.sort_num,
 sb.financing_no_two,
 sb.financing_no_third,
 sb.financing_no_four,