From 780d2ae86cc0c4ebd42922f649bf557f1f17cd62 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 09 二月 2026 16:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/basic/controller/EnumController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/EnumController.java b/src/main/java/com/ruoyi/basic/controller/EnumController.java
index b02326a..235eb26 100644
--- a/src/main/java/com/ruoyi/basic/controller/EnumController.java
+++ b/src/main/java/com/ruoyi/basic/controller/EnumController.java
@@ -1,7 +1,7 @@
package com.ruoyi.basic.controller;
import com.ruoyi.basic.utils.EnumUtils;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.web.domain.R;
@@ -24,13 +24,13 @@
@GetMapping("/stockRecordType")
@Anonymous
public R getStockRecordTypeEnum(){
- List<Map<String, Object>> list = EnumUtil.toList(StockQualifiedRecordTypeEnum.class);
+ List<Map<String, Object>> list = EnumUtil.toList(StockOutQualifiedRecordTypeEnum.class);
return R.ok(list);
}
@GetMapping("/{className}")
@Anonymous
- public R test(@PathVariable String className){
+ public R stockRecordTypeByClassName(@PathVariable("className") String className){
return R.ok(EnumUtils.getOptions("com.ruoyi.common.enums." + className));
}
}
--
Gitblit v1.9.3