From df78a9f5867e7723222d068bcdc8e6a06c6504c6 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 05 九月 2023 17:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java |  145 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 132 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
index eefa7c8..775e066 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
@@ -1,5 +1,6 @@
 package com.vci.ubcs.code.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.vci.ubcs.starter.constant.CodeTableNameConstant;
 import com.vci.ubcs.starter.revision.model.BaseModel;
@@ -22,81 +23,199 @@
 	/**
 	 * 绯荤粺id
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "绯荤粺id")
 	private String systemOid;
 
 	/**
 	 * 绯荤粺缂栧彿
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "绯荤粺缂栧彿")
 	private String systemCode;
 
 	/**
 	 * 绯荤粺鍚嶇О
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "绯荤粺鍚嶇О")
 	private String systemName;
 
 	/**
 	 * 鍒嗙被oid
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鍒嗙被oid")
 	private String classifyOid;
 
 	/**
 	 * 鍒嗙被id
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鍒嗙被id")
 	private String classifyId;
 
 	/**
 	 * 鍒嗙被name
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鍒嗙被name")
 	private String classifyName;
 
 	/**
 	 * 鍞竴鏍囪瘑
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鍞竴鏍囪瘑")
 	private String uniqueCode;
 
 	/**
 	 * 鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤")
 	private String type;
+	/***
+	 * 鎺ュ彛绫诲瀷鏄剧ず鍊�
+	 */
+	@ApiModelProperty(value = "鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤")
+	@TableField(exist = false)
+	private String typeText;
 
 	/**
 	 * 杩旇繕鎻愮ず
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "杩旇繕鎻愮ず")
 	private String msg;
 
 	/**
 	 * 鍙傛暟锛氶�氱煡鎺ュ彛鏄垜浠紶鍑虹殑鍙傛暟/鏌ヨ鎺ュ彛鏄埆浜轰紶鍏ョ殑鍙傛暟
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鍙傛暟")
 	private String paramString;
 
 	/**
 	 * 浼犻�抶ml
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "浼犻�抶ml")
 	private String sendXml;
 
 	/**
 	 * 杩斿洖锛氶�氱煡鎺ュ彛鏄垜浠敹鍒扮殑鍙嶉锛屾煡璇㈡帴鍙f槸鍒汉鏀跺埌鐨勫弽棣�
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "杩斿洖")
 	private String returnString;
 
 	/**
 	 * 鎺ュ彛鐘舵�侊細鎴愬姛/澶辫触
 	 */
-	@ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+	@ApiModelProperty(value = "鎺ュ彛鐘舵��")
 	private String interfaceStatus;
 
+	public String getSystemOid() {
+		return systemOid;
+	}
+
+	public void setSystemOid(String systemOid) {
+		this.systemOid = systemOid;
+	}
+
+	public String getSystemCode() {
+		return systemCode;
+	}
+
+	public void setSystemCode(String systemCode) {
+		this.systemCode = systemCode;
+	}
+
+	public String getSystemName() {
+		return systemName;
+	}
+
+	public void setSystemName(String systemName) {
+		this.systemName = systemName;
+	}
+
+	public String getClassifyOid() {
+		return classifyOid;
+	}
+
+	public void setClassifyOid(String classifyOid) {
+		this.classifyOid = classifyOid;
+	}
+
+	public String getClassifyId() {
+		return classifyId;
+	}
+
+	public void setClassifyId(String classifyId) {
+		this.classifyId = classifyId;
+	}
+
+	public String getClassifyName() {
+		return classifyName;
+	}
+
+	public void setClassifyName(String classifyName) {
+		this.classifyName = classifyName;
+	}
+
+	public String getUniqueCode() {
+		return uniqueCode;
+	}
+
+	public void setUniqueCode(String uniqueCode) {
+		this.uniqueCode = uniqueCode;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getTypeText() {
+		return typeText;
+	}
+
+	public void setTypeText(String typeText) {
+		this.typeText = typeText;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public String getParamString() {
+		return paramString;
+	}
+
+	public void setParamString(String paramString) {
+		this.paramString = paramString;
+	}
+
+	public String getSendXml() {
+		return sendXml;
+	}
+
+	public void setSendXml(String sendXml) {
+		this.sendXml = sendXml;
+	}
+
+	public String getReturnString() {
+		return returnString;
+	}
+
+	public void setReturnString(String returnString) {
+		this.returnString = returnString;
+	}
+
+	public String getInterfaceStatus() {
+		return interfaceStatus;
+	}
+
+	public void setInterfaceStatus(String interfaceStatus) {
+		this.interfaceStatus = interfaceStatus;
+	}
+
 	@Override
 	public String toString() {
 		return "DockingLogeDO{" +

--
Gitblit v1.9.3