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

epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml

@@ -128,14 +128,14 @@
             <maxHistory>15</maxHistory>
         </rollingPolicy>
         <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
-        <!--<filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
             <appName>${appname}</appName>
-        </filter>-->
+        </filter>
     </appender>
 
     <!-- 开发、测试环境 -->

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

@@ -202,7 +202,7 @@
 
     <select id="checkNameUq" parameterType="map" resultType="java.lang.Integer">
         select
-               count(a.*)
+               count(*)
         from ic_neighbor_hood a
         where a.del_flag='0'
         and a.customer_id=#{customerId}