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/DockingPreApplyForm.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
similarity index 75%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
index 324cc99..b6270ed 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
@@ -6,21 +6,26 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
/**
* 闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�
* @author xiejun
* @date 2023-05-22
*/
@Data
-@TableName("PL_CODE_JINTEGMAPCONFIG")
+@TableName("PL_CODE_JAPPLYCODEFORM")
@ApiModel(value = "DockingPreApplyForm", description = "闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�")
@EqualsAndHashCode
public class DockingPreApplyForm extends BaseModel {
-
/***
* 闆嗗洟缂栫爜
*/
@ApiModelProperty(value = "闆嗗洟缂栫爜")
+ private String groupCode;
+ /***
+ * 閿欒鏍囪瘑鐮�
+ */
+ @ApiModelProperty(value = "閿欒鏍囪瘑鐮�")
private String code;
/***
@@ -43,4 +48,9 @@
*/
@ApiModelProperty(value = "娑堟伅")
private String msg;
+ /**
+ * 鐢宠鍗曠被鍨�1:鐢宠锛�2锛氭洿鏀�
+ */
+ @ApiModelProperty(value = "娑堟伅")
+ private String operationType;
}
--
Gitblit v1.9.3