From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java
index 012e5a0..1a1ab2d 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java
@@ -23,6 +23,9 @@
     @ApiModelProperty(value="结束时间")
     private Date reserveTimeEnd;
 
+    @ApiModelProperty(value = "是否禁用 0:未冻结,1:冻结")
+    private String isProhibit;
+
     @ApiModelProperty(value="第几页",required=true)
     private int page;
 

--
Gitblit v1.9.1