From db1c3c5b3670639fd1dfc5de0fe75ce6f02f732e Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 31 五月 2023 14:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
similarity index 92%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
index a69a6eb..9a5bde0 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@
 import lombok.EqualsAndHashCode;
 
 @Data
-@TableName("PL_CODE_JVIEWMODE")
+@TableName("PL_CODE_JMETAATTR")
 @ApiModel(value = "DockingPreViewModel", description = "闆嗗洟鍒嗙被妯″瀷瑙嗗浘淇℃伅")
 @EqualsAndHashCode
 public class DockingPreMetaAttr extends BaseModel {
@@ -54,6 +54,7 @@
 	 * 瑙嗗浘妯″瀷id
 	 */
 	@ApiModelProperty(value = "瑙嗗浘妯″瀷涓婚敭")
+	@TableField(value = "viewModeId")
 	private String viewModelId;
 	/***
 	 * 榛樿鍊�

--
Gitblit v1.9.3