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

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -169,7 +169,9 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+        ORDER BY a.sort,
+        CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk)
     </select>
 
     <select id="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql

@@ -1 +1 @@
-alter table pli_change_relocation add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间';
+alter table pli_change_death add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间';