Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/entity/JkxlDetailFee.java

@@ -378,7 +378,7 @@ public class JkxlDetailFee {
         this.qtFee = qtFee;
     }
 
-    @ExcelField(title="结算价", align=2, sort=12)
+
     public Double getJsFee() {
         return jsFee;
     }
@@ -387,7 +387,6 @@ public class JkxlDetailFee {
         this.jsFee = jsFee;
     }
 
-    @ExcelField(title="差额", align=2, sort=13)
     public Double getcFee() {
         return cFee;
     }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -11,6 +11,7 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.item_name AS "itemName",
+		a.item_no AS "itemNo",
 		a.unit AS "unit",
 	    a.project_id AS "projectId",
 		a.parent_node AS "parentNode",