Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi into test_branch

whepi-web/src/main/java/com/bofeng/dao/OutUserMapper.java

@@ -20,7 +20,7 @@ public interface OutUserMapper extends BaseMapper<OutUser> {
     OutUser getOutUserByPhone(@Param("name") String name, @Param("phone") Long phone);
 
     @Select("SELECT * FROM out_user WHERE phone = #{phone} and start_date <= curdate() and end_date >= curdate()")
-    OutUser getOutUserByPhone(@Param("phone") Long phone);
+    OutUser queryOutUserByPhone(@Param("phone") Long phone);
 
     List<OutUser> getAllOutUser(PageDb pageDb, Map<String, Object> queryParam);
 

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -123,7 +123,7 @@ public class ScanAdminController {
     @ApiOperation("保存特殊人员")
     @PostMapping("/whepi/OutUser/saveOutUser")
     public Model saveOutUser(@JsonBody OutUser outUser) {
-        OutUser outUser1 = outUserMapper.getOutUserByPhone(outUser.getPhone());
+        OutUser outUser1 = outUserMapper.queryOutUserByPhone(outUser.getPhone());
         if (outUser1 != null) {
             return Model.newFail("该号码已经添加为特殊人员，请仔细检查该号码。");
         }