Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -151,7 +151,7 @@
             and a.call_time between #{startTime} and #{endTime}
         </if>
         <if test="alertTypeCode!= null and alertTypeCode!= '' ">
-            and a.alarm_type_code = #{alertTypeCode}
+            and a.alert_type_code = #{alertTypeCode}
         </if>
         <if test="alertSourceCode!= null ">
             and a.alert_source_code = #{alertSourceCode}