Merge remote-tracking branch 'origin/master'

src/main/java/com/four/common/duck/communitypatients/DetailsPatientCircle.java

@@ -72,6 +72,11 @@ public class DetailsPatientCircle {
      */
     private Long numberComments;
 
+    /**
+     * 状态1：未采纳，状态2：已采纳
+     */
+    private Integer detailsPatientCircleStatus;
+
     /**
      * 创建人
      */
@@ -91,29 +96,6 @@ public class DetailsPatientCircle {
         return detailsPatientCircleFounder;
     }
 
-    @Override
-    public String toString() {
-        return "DetailsPatientCircle{" +
-                "detailsPatientCircleId=" + detailsPatientCircleId +
-                ", title='" + title + '\'' +
-                ", publisherId=" + publisherId +
-                ", diseaseId=" + diseaseId +
-                ", departmentId=" + departmentId +
-                ", detailsSymptoms='" + detailsSymptoms + '\'' +
-                ", treatmentExperienceStartTime=" + treatmentExperienceStartTime +
-                ", treatmentExperienceEndTime=" + treatmentExperienceEndTime +
-                ", treatmentExperience='" + treatmentExperience + '\'' +
-                ", relatedPictures='" + relatedPictures + '\'' +
-                ", rewardAmount=" + rewardAmount +
-                ", collectionQuantity=" + collectionQuantity +
-                ", numberComments=" + numberComments +
-                ", detailsPatientCircleFounder='" + detailsPatientCircleFounder + '\'' +
-                ", detailsPatientCircleFounderTime=" + detailsPatientCircleFounderTime +
-                ", detailsPatientCircleModificator='" + detailsPatientCircleModificator + '\'' +
-                ", detailsPatientCircleModificatorTime=" + detailsPatientCircleModificatorTime +
-                '}';
-    }
-
     public void setDetailsPatientCircleFounder(String detailsPatientCircleFounder) {
         this.detailsPatientCircleFounder = detailsPatientCircleFounder;
     }
@@ -269,4 +251,35 @@ public class DetailsPatientCircle {
     public void setNumberComments(Long numberComments) {
         this.numberComments = numberComments;
     }
+    public Integer getDetailsPatientCircleStatus() {
+        return detailsPatientCircleStatus;
+    }
+
+    public void setDetailsPatientCircleStatus(Integer detailsPatientCircleStatus) {
+        this.detailsPatientCircleStatus = detailsPatientCircleStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "DetailsPatientCircle{" +
+                "detailsPatientCircleId=" + detailsPatientCircleId +
+                ", title='" + title + '\'' +
+                ", publisherId=" + publisherId +
+                ", diseaseId=" + diseaseId +
+                ", departmentId=" + departmentId +
+                ", detailsSymptoms='" + detailsSymptoms + '\'' +
+                ", treatmentExperienceStartTime=" + treatmentExperienceStartTime +
+                ", treatmentExperienceEndTime=" + treatmentExperienceEndTime +
+                ", treatmentExperience='" + treatmentExperience + '\'' +
+                ", relatedPictures='" + relatedPictures + '\'' +
+                ", rewardAmount=" + rewardAmount +
+                ", collectionQuantity=" + collectionQuantity +
+                ", numberComments=" + numberComments +
+                ", detailsPatientCircleStatus=" + detailsPatientCircleStatus +
+                ", detailsPatientCircleFounder='" + detailsPatientCircleFounder + '\'' +
+                ", detailsPatientCircleFounderTime=" + detailsPatientCircleFounderTime +
+                ", detailsPatientCircleModificator='" + detailsPatientCircleModificator + '\'' +
+                ", detailsPatientCircleModificatorTime=" + detailsPatientCircleModificatorTime +
+                '}';
+    }
 }

src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java

@@ -78,6 +78,10 @@ public class DetailsPatientCircleDetailCollection {
      * 评论数量
      */
     private Long numberComments;
+    /**
+     * 状态1：未采纳，状态2：已采纳
+     */
+    private Integer detailsPatientCircleStatus;
 
     //--------------------------------------------------------
     //--------------------------------------------------------

src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java

@@ -77,6 +77,10 @@ public class DetailsPatientCircleDetailedReview {
      * 评论数量
      */
     private Long numberComments;
+    /**
+     * 状态1：未采纳，状态2：已采纳
+     */
+    private Integer detailsPatientCircleStatus;
 
     //------------------------------------------------------
     //------------------------------------------------------

src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java

@@ -78,6 +78,10 @@ public class DetailsPatientCircleSymptomsDrugs {
      * 评论数量
      */
     private Long numberComments;
+    /**
+     * 状态1：未采纳，状态2：已采纳
+     */
+    private Integer detailsPatientCircleStatus;
 
     //----------------------------------------------------------
     //----------------------------------------------------------