From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 15:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/SegmentsController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/SegmentsController.java b/server/admin/src/main/java/com/doumee/api/business/SegmentsController.java
index f3128d8..d68da58 100644
--- a/server/admin/src/main/java/com/doumee/api/business/SegmentsController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/SegmentsController.java
@@ -1,12 +1,14 @@
package com.doumee.api.business;
import com.doumee.api.BaseController;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.Segments;
+import com.doumee.dao.business.vo.UnitCodeVo;
import com.doumee.service.business.SegmentsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +31,8 @@
@Autowired
private SegmentsService segmentsService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -45,6 +49,11 @@
segmentsService.deleteById(id);
return ApiResponse.success(null);
}
+ @ApiOperation("鑾峰彇鍏ㄩ儴鍝佺墝鏁版嵁")
+ @GetMapping("/getUnitList")
+ public ApiResponse<List<UnitCodeVo>> getUnitList() {
+ return ApiResponse.success(systemDictDataBiz.getUnitList());
+ }
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
--
Gitblit v1.9.3