From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
index 1e7789e..11836d7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/SaveUnionChangeDTO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.dto;
+import com.doumee.dao.business.model.ApplyChange;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +23,9 @@
@ApiModelProperty(value = "鍔犲噺淇�/鎹㈠巶鍗曟嵁涓婚敭 澶氫釜浠�,鍒嗗壊")
private List<Integer> applyIds;
+ @ApiModelProperty(value = "鍔犲噺淇�/鎹㈠巶鍗曟嵁鍗曞ご" ,hidden = true)
+ private ApplyChange applyChange;
+
@ApiModelProperty(value = "鎵瑰崟鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date applyDate;
@@ -38,4 +42,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date delValidDate;
+ @ApiModelProperty(value = "鍟嗘埛涓婚敭")
+ private Integer shopId;
}
--
Gitblit v1.9.3