Merge remote-tracking branch 'origin/master'

inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/ExtReviewFeedbackVO.java

@@ -68,8 +68,7 @@ public class ExtReviewFeedbackVO extends IdOnlyVO implements DxIterationVOHolder
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String EXT_REVIEW_MINUTES_FEEDBACK_LINKS_PROP_NAME = "extReviewMInutesFeedbackLinks";
-    public static final String NOTE_PROP_NAME = "note";
-    public static final String NUMBER_PROP_NAME = "number";
+
     public static final String OPINION_REPLY_PROP_NAME = "opinionReply";
     public static final String PLAN_COMPLATE_TIME_PROP_NAME = "planComplateTime";
     public static final String PLAN_FINISH_TIME_PROP_NAME = "planFinishTime";
@@ -139,15 +138,7 @@ public class ExtReviewFeedbackVO extends IdOnlyVO implements DxIterationVOHolder
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private List<ExtReviewMInutesFeedbackLinkVO> extReviewMInutesFeedbackLinks;
 
-    /**
-    * 备注
-    */
-    private String note;
 
-    /**
-    * 编号
-    */
-    private String number;
 
     /**
     * 意见答复

inet-doc-expand-entity/src/main/java/com/inet/dcs/document/entity/po/ExtReviewFeedback.java

@@ -94,14 +94,7 @@ public class ExtReviewFeedback extends IdOnlyEntity implements DxContextHolder ,
     @DexEmbedded()
     @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
-    /**
-    * 备注
-    */
-    private String note;
-    /**
-    * 编号
-    */
-    private String number;
+
     /**
     * 意见答复
     */