hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dingding

Browse Source 
# Conflicts:
#	evo-admin/src/main/java/com/evo/restaurant/controller/RzRestaurantDetailController.java
This commit is contained in:
andy 2026-04-06 09:16:50 +08:00
commit a15b5ec75a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
evo-admin/src/main/resources/kdwebapi.properties
View File

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