Merge branch 'master' into dingding

# Conflicts:
#	evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantDetailController.java

evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantDetailController.java

@@ -25,6 +25,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,9 +42,9 @@ import java.util.List;
 @RequestMapping("/api/v2")
 public class RzRestaurantDetailController extends BaseController
 {
-    @Autowired
+    @Resource
     private IRzRestaurantDetailService rzRestaurantDetailService;
-    @Autowired
+    @Resource
     private ISysStaffService sysStaffService;
     /**
      * 查询餐饮详情列表
@@ -89,7 +90,7 @@ public class RzRestaurantDetailController extends BaseController
      */
     @RequestMapping("/verify_user_yt")
     public String verifyUser(@RequestBody String json){
-        return "接口暂停使用"; //rzRestaurantDetailService.insertRzRestaurantDetail(json);
+        return "接口停止使用";//rzRestaurantDetailService.insertRzRestaurantDetail(json);
     }
 
     /**

evo-admin/src/main/resources/kdwebapi.properties

@@ -1,6 +1,6 @@
 #??ID-PROD
 #X-KDApi-AcctID = 670768a85463de
-X-KDApi-AcctID = 698ad0d6c0c3fe
+X-KDApi-AcctID = 69d0e0f3a5801e
 #X-KDApi-AcctID = 6723465a38c722
 X-KDApi-UserName = Administrator
 #??IDID