Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/YZT_YUHANG

YHYZT/server/src/main/java/com/zjugis/yzt/beans/entity/SsnydNew.java

@@ -64,4 +64,5 @@ public class SsnydNew {
     private Double bamj;
     @TableField
     private String shape;
+    private String bz;
 } 

YHYZT/server/src/main/java/com/zjugis/yzt/beans/vo/SsnydVO.java

@@ -17,4 +17,5 @@ public class SsnydVO {
     private String xzq;
     private Double bamj;
     private String shape;
+    private String bz;
 } 

YHYZT/server/src/main/java/com/zjugis/yzt/service/impl/SsnydServiceImpl.java

@@ -126,6 +126,7 @@ public class SsnydServiceImpl extends ServiceImpl<SsnydNewMapper, SsnydNew> impl
 
     /**
      * row转换成SsnydNew
+     *
      * @param errorList
      * @param row
      * @return
@@ -140,6 +141,7 @@ public class SsnydServiceImpl extends ServiceImpl<SsnydNewMapper, SsnydNew> impl
         ssnydNew.setYt(FileUtils.getString(row, "用途"));
         ssnydNew.setBamj(FileUtils.getDouble(row, "备案面积"));
         ssnydNew.setXmbh(FileUtils.getString(row, "项目索引"));
+        ssnydNew.setBz(FileUtils.getString(row, "备注"));
         // 处理日期字段
         if (setBasj(errorList, row, ssnydNew)) return null;
         return ssnydNew;
@@ -147,6 +149,7 @@ public class SsnydServiceImpl extends ServiceImpl<SsnydNewMapper, SsnydNew> impl
 
     /**
      * 设置备案时间
+     *
      * @param errorList
      * @param row
      * @param ssnydNew
@@ -177,6 +180,7 @@ public class SsnydServiceImpl extends ServiceImpl<SsnydNewMapper, SsnydNew> impl
 
     /**
      * 更新shape字段
+     *
      * @param errorList
      * @param objectId
      * @param projectIndex