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

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_heart`.`ic_party_activity`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`;
+ALTER TABLE `epmet_heart`.`latest_act_info`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -102,6 +102,6 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @author zxc
      * @date 2022/4/12 16:42
      */
-    List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards);
+    List<HousesNameResultDTO> getHousesNameByIdCards(@Param("idCards") List<String> idCards);
 
 }