Merge remote-tracking branch 'origin/master'

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtExpenditureContractVO.java

@@ -383,7 +383,7 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
     /**
     * 起止时间
     */
-    private LocalDateTime startingEndingTime;
+    private String startingEndingTime;
 
     /**
     * 所属子课题财务编号

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtExpenditureContract.java

@@ -217,7 +217,7 @@ public class ExtExpenditureContract extends IdOnlyEntity implements DxContextHol
     /**
     * 起止时间
     */
-    private LocalDateTime startingEndingTime;
+    private String startingEndingTime;
     /**
     * 所属子课题财务编号
     */