From f4acc42e357cb097e20e7822fdb954bc35e8f707 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei>
Date: 星期三, 04 三月 2026 13:47:40 +0800
Subject: [PATCH] fix(mudoule(qa)): 部分配置调整
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java | 1 +
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java | 6 +++---
ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts | 28 ++++++++++++++--------------
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java | 4 ++--
ruoyi-plus-soybean/src/views/md/shift/index.vue | 2 +-
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java | 2 ++
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java | 2 ++
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java | 4 ++--
8 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java
index 8c23f46..5732f7c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/StoreSilkInfo.java
@@ -16,6 +16,7 @@
* @date 2026-03-02
*/
@Data
+@EqualsAndHashCode(callSuper = false)
@TableName("oracle_store_silk")
public class StoreSilkInfo {
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java
index 72bc5f6..f2dfddb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/controller/MdShiftController.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.baomidou.dynamic.datasource.annotation.DS;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
@@ -28,6 +29,7 @@
* @author zhuguifei
* @date 2026-03-04
*/
+@DS("oracle")
@Validated
@RequiredArgsConstructor
@RestController
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java
index 2c40db0..66a2245 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/MdShift.java
@@ -16,15 +16,15 @@
* @date 2026-03-04
*/
@Data
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
@TableName("MD_SHIFT")
-public class MdShift extends BaseEntity {
+public class MdShift {
@Serial
private static final long serialVersionUID = 1L;
/**
- * ud
+ * id
*/
@TableId(value = "ID")
private String id;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java
index 8e19413..c2af352 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/bo/MdShiftBo.java
@@ -23,9 +23,9 @@
public class MdShiftBo extends BaseEntity {
/**
- * ud
+ * id
*/
- @NotBlank(message = "ud涓嶈兘涓虹┖", groups = { EditGroup.class })
+ @NotBlank(message = "id涓嶈兘涓虹┖", groups = { EditGroup.class })
private String id;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java
index 9d9e8cd..c456247 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/domain/vo/MdShiftVo.java
@@ -31,9 +31,9 @@
private static final long serialVersionUID = 1L;
/**
- * ud
+ * id
*/
- @ExcelProperty(value = "ud")
+ @ExcelProperty(value = "id")
private String id;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java
index 8c697b5..ccfe635 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/md/service/impl/MdShiftServiceImpl.java
@@ -1,5 +1,6 @@
package org.dromara.md.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -26,6 +27,7 @@
* @author zhuguifei
* @date 2026-03-04
*/
+@DS("oracle")
@Slf4j
@RequiredArgsConstructor
@Service
diff --git a/ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts b/ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts
index 9d44c00..a5f6ce0 100644
--- a/ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts
+++ b/ruoyi-plus-soybean/src/typings/api/md.shift.api.d.ts
@@ -12,32 +12,32 @@
namespace Md {
/** shift */
type Shift = Common.CommonRecord<{
- /** ud */
- id: CommonType.IdType;
+ /** id */
+ id: CommonType.IdType;
/** 杞﹂棿澶栭敭 */
- wsId: CommonType.IdType;
+ wsId: CommonType.IdType;
/** 缂栫爜 */
- code: string;
+ code: string;
/** 鍚嶇О */
- name: string;
+ name: string;
/** 鐝寮�濮嬫椂闂� */
- stim: string;
+ stim: string;
/** 鐝缁撴潫鏃堕棿 */
- etim: string;
+ etim: string;
/** 鎺掑簭 */
- seq: number;
+ seq: number;
/** 鍚敤 */
- enable: number;
+ enable: number;
/** 鍒犻櫎 */
- del: number;
+ del: number;
/** 鍒涘缓鐢ㄦ埛 */
- createUserName: string;
+ createUserName: string;
/** 鍒涘缓鏃堕棿 */
- createUserTime: string;
+ createUserTime: string;
/** 鏇存柊鐢ㄦ埛 */
- updateUserName: string;
+ updateUserName: string;
/** 鏇存柊鏃堕棿 */
- updateUserTime: string;
+ updateUserTime: string;
}>;
/** shift search params */
diff --git a/ruoyi-plus-soybean/src/views/md/shift/index.vue b/ruoyi-plus-soybean/src/views/md/shift/index.vue
index d28d6b0..c56d90a 100644
--- a/ruoyi-plus-soybean/src/views/md/shift/index.vue
+++ b/ruoyi-plus-soybean/src/views/md/shift/index.vue
@@ -52,7 +52,7 @@
},
{
key: 'id',
- title: 'ud',
+ title: 'id',
align: 'center',
minWidth: 120
},
--
Gitblit v1.9.3