Merge remote-tracking branch 'origin/master'

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

@@ -55,7 +55,7 @@ import com.inet.dcs.document.common.vo.ExtBorrowingDocLinkVO;
 * @description: ExtBorrowingForm-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-31 14:17:35
+* @date: 2024-11-8 9:51:42
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtBorrowingFormVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -71,6 +71,7 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
     public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
+    public static final String ACTUAL_RETURN_TIME_PROP_NAME = "actualReturnTime";
     public static final String BORROWER_PHONE_PROP_NAME = "borrowerPhone";
     public static final String BORROWING_DATE_PROP_NAME = "borrowingDate";
     public static final String BORROWING_PURPOSE_PROP_NAME = "borrowingPurpose";
@@ -145,6 +146,11 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
     @JsonIgnore
     private DxSecretVOEmbeddable dxSecretEmbeddable;
 
+    /**
+    * 实际归还日期
+    */
+    private LocalDateTime actualReturnTime;
+
     /**
     * 借阅人电话
     */

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

@@ -45,7 +45,7 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtBorrowingForm-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-31 14:17:35
+* @date: 2024-11-8 9:51:42
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -103,6 +103,10 @@ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,D
     @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
+    * 实际归还日期
+    */
+    private LocalDateTime actualReturnTime;
+    /**
     * 借阅人电话
     */
     private String borrowerPhone;