From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/common/service/erp/ErpController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/ErpController.java b/src/main/java/com/zy/common/service/erp/ErpController.java
index 8a6ab28..dce183e 100644
--- a/src/main/java/com/zy/common/service/erp/ErpController.java
+++ b/src/main/java/com/zy/common/service/erp/ErpController.java
@@ -17,9 +17,19 @@
@Autowired
private ErpService erpService;
- @GetMapping("erp/goods/list")
+ @GetMapping("/goods/list")
public R goodsList() {
return R.ok().add(erpService.selectGoods(0));
}
+ @GetMapping("/voucher/list")
+ public R voucherList() {
+ return R.ok().add(erpService.selectVoucher(0));
+ }
+
+// @GetMapping("/voucherDetail/list")
+// public R voucherDetailList() {
+// return R.ok().add(erpService.selectVoucherDetail(0));
+// }
+
}
--
Gitblit v1.9.1