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

3 years ago · 979ecca8a7
2 changed files with 2 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
+++ b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml
@ -7,7 +7,8 @@
    <update id="cancelAttention">
        UPDATE ic_epidemic_special_attention
        SET UPDATED_TIME = NOW(),
-            IS_ATTENTION = 0
+            IS_ATTENTION = 0,
+            del_flag = 1
        WHERE del_flag = 0
          AND attention_type = #{attentionType}
          AND id_card IN (