合并

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java

@@ -96,13 +96,13 @@ public class IcEpidemicSpecialAttentionController {
     }
 
     /**
-     * Desc: 【疫苗接种关注名单】导入
+     * Desc: 【疫苗接种关注名单，核酸检测关注名单】导入
      * @param
      * @author zxc
      * @date 2022/3/28 13:40
      */
     @PostMapping("vaccination-import")
-    public Result vaccinationImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file){
+    public Result vaccinationImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file,@RequestParam("attentionType")Integer attentionType){
 
         return new Result();
     }
@@ -131,16 +131,4 @@ public class IcEpidemicSpecialAttentionController {
 
     }
 
-    /**
-     * Desc: 【核酸检测关注名单】导入
-     * @param
-     * @author zxc
-     * @date 2022/3/28 13:40
-     */
-    @PostMapping("nat-import")
-    public Result natImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file){
-
-        return new Result();
-    }
-
 }