Commit 7648f6b5 authored by wangqiang's avatar wangqiang

Merge remote-tracking branch 'origin/master'

parents 339bfa6d 9ba21537
...@@ -383,7 +383,7 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex ...@@ -383,7 +383,7 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
/** /**
* 起止时间 * 起止时间
*/ */
private LocalDateTime startingEndingTime; private String startingEndingTime;
/** /**
* 所属子课题财务编号 * 所属子课题财务编号
......
...@@ -217,7 +217,7 @@ public class ExtExpenditureContract extends IdOnlyEntity implements DxContextHol ...@@ -217,7 +217,7 @@ public class ExtExpenditureContract extends IdOnlyEntity implements DxContextHol
/** /**
* 起止时间 * 起止时间
*/ */
private LocalDateTime startingEndingTime; private String startingEndingTime;
/** /**
* 所属子课题财务编号 * 所属子课题财务编号
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment