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

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineRelationDao.java

@@ -13,5 +13,5 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface IcVaccineRelationDao extends BaseDao<IcVaccineRelationEntity> {
-    int delRelation(@Param("icNatId") String icNatId, @Param("agencyId") String agencyId);
+    int delRelation(@Param("icVaccineId") String icNatId, @Param("agencyId") String agencyId);
 }

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

@@ -5,9 +5,9 @@
 
     <delete id="delRelation">
         DELETE
-        FROM ic_nat_relation
+        FROM ic_vaccine_relation
         WHERE
-        ic_nat_id = #{icNatId}
+        ic_vaccine_id = #{icVaccineId}
         <if test='null != agencyId and "" != agencyId'>
             AND AGENCY_ID = #{agencyId}
         </if>