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

epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml

@@ -43,6 +43,9 @@
         on(d.IC_USER_CHANGE_RECORD_ID=r.id and r.DEL_FLAG='0')
         where d.DEL_FLAG='0'
         and d.FIELD_NAME=#{categoryKey}
+        <if test="type != null and type !=''">
+            and d.type=#{type}
+        </if>
         <if test="orgType != null and orgType !=''">
             <if test="orgType == 'agency'">
                 and (d.AGENCY_ID=#{orgId} or d.pids like concat('%',#{orgId},'%'))