Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -272,6 +272,7 @@
         WHERE
             ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
             AND LENGTH(ifi.COLUMN_NAME)>0
+        ORDER BY ifi.SORT
     </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -218,6 +218,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
         searchForm.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(searchForm, IcResiUserPageFormDTO.AddUserInternalGroup.class);
         searchForm.setIsPage(false);
+        searchForm.setPageSize(NumConstant.TEN_THOUSAND);
     }
 
     @Nullable