From ccbf7105edf18752ab64871d6112abd4f96cf8d4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:35 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
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