From 483af85d1bf87622467173818a4fb0f2383b6f3a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 20 十月 2023 09:52:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
index 26a0a2c..dc7c752 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.starter.revision.model.BaseModel;
/**
* 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
@@ -9,7 +9,7 @@
* @author weidy
* @date 2022-01-24
*/
-public class CodeBasicSecDTO extends BaseModelVO {
+public class CodeBasicSecDTO extends BaseModel {
/**
* 绂佹淇敼杩欎釜鍊�
@@ -19,12 +19,12 @@
/**
* 鐮佹绫诲瀷
*/
- private String sectype;
+ private String secType;
/**
* 鐮佹绫诲瀷鏄剧ず鏂囨湰
*/
- private String sectypeText;
+ private String secTypeText;
/**
* 缂栫爜瑙勫垯涓婚敭
@@ -81,7 +81,6 @@
* 鐮佹闀垮害
*/
private String codeSecLength;
-
/**
* 灞傜骇绫诲瀷
@@ -148,7 +147,6 @@
*/
private String filterSql ;
-
/**
* 娴佹按鍙疯捣濮嬪��
*/
@@ -158,7 +156,6 @@
* 娴佹按鐨勬闀�
*/
private Integer serialStep;
-
/**
* 缂栫爜琛ヤ綅鏂瑰紡
@@ -210,7 +207,6 @@
*/
private String parentClassifySecText;
-
/**
* 鏄惁鍙互涓虹┖
*/
@@ -240,26 +236,27 @@
* 閫夋嫨鐮佹淇℃伅鐨勪富閿泦鍚�
*/
private String oidArr;
+
/**
* 鑾峰彇 鐮佹绫诲瀷
*/
- public String getSectype (){
- return sectype;
+ public String getSecType (){
+ return secType;
}
/**
* 璁剧疆 鐮佹绫诲瀷
*/
- public void setSectype (String sectype){
- this.sectype = sectype;
+ public void setSecType (String sectype){
+ this.secType = sectype;
}
- public String getSectypeText() {
- return sectypeText;
+ public String getSecTypeText() {
+ return secTypeText;
}
- public void setSectypeText(String sectypeText) {
- this.sectypeText = sectypeText;
+ public void setSecTypeText(String secTypeText) {
+ this.secTypeText = secTypeText;
}
/**
@@ -620,8 +617,8 @@
@Override
public String toString() {
return "CodeBasicSecDTO{" +
- "sectype='" + sectype + '\'' +
- ", sectypeText='" + sectypeText + '\'' +
+ "sectype='" + secType + '\'' +
+ ", secTypeText='" + secTypeText + '\'' +
", pkCodeRule='" + pkCodeRule + '\'' +
", orderNum=" + orderNum +
", referBtmId='" + referBtmId + '\'' +
--
Gitblit v1.9.3