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

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java

@@ -47,7 +47,7 @@ public interface IcFormDao extends BaseDao<IcFormEntity> {
      */
     CustomerFormResultDTO selectByCode(@Param("customerId") String customerId, @Param("formCode") String formCode);
 
-    List<FormItemResult> selectItemList(String formId, Boolean dynamic);
+    List<FormItemResult> selectItemList(@Param("formId") String formId, @Param("dynamic") Boolean dynamic);
 
     List<FormItemResult> selectItemListByGroupId(String groupId);
     List<OptionDTO> selectListOption(String itemId);

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

@@ -82,7 +82,7 @@
         )
     </select>
 
-    <select id="selectItemList" parameterType="java.lang.String" resultMap="FormItemMap1">
+    <select id="selectItemList" parameterType="map" resultMap="FormItemMap1">
         SELECT
             fi.ID AS item_id,
             'ic_resi_user' AS table_name,