Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -174,8 +174,8 @@
             cg.*
         FROM customer_grid cg
         LEFT JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.DEL_FLAG = '0')
-        WHERE cg.DEL_FLAG = '0'
-          AND cg.ID = #{gridId}
+        WHERE cg.ID = #{gridId}
+          AND cg.DEL_FLAG = '0'
     </select>
 
 </mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/CustomerGridDTO.java

@@ -131,4 +131,9 @@ public class CustomerGridDTO implements Serializable {
      * 所有上级组织名
      */
     private String allParentName;
+
+    /**
+     * 弃用标记
+     */
+    private Integer abandonFlag;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql

@@ -1,3 +1,3 @@
 alter table customer_grid
-add column ABANDON_FLAG TINYINT(1) default '0'
+add column ABANDON_FLAG TINYINT(1) NOT NULL default '0'
 comment '弃用：1；正常使用：0' after SYNC_FLAG;