Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 @ApiModel(value = "驻外人员探亲申请", description = "驻外人员探亲申请")
 @TableName("ad_expatriates_home_apply")
@@ -61,6 +63,10 @@ public class AdExpatriatesHomeApply extends BaseEntity {
     @ApiModelProperty("探亲类型")
     private String homeTypeKey;
     private String homeTypeValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
     @ApiModelProperty("基础表单sid")
     private String formSid; // 基础表单sid
     @ApiModelProperty("关联审批sid列表,英文逗号分隔")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java

@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,6 +58,10 @@ public class AdExpatriatesHomeApplyDetailVo implements Vo {
     private String peoNum;
     @ApiModelProperty("探亲类型")
     private String homeTypeValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
     @ApiModelProperty("备注")
     private String remarks;
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,6 +66,10 @@ public class AdExpatriatesHomeApplyDto extends OaFormDto {
     private FormCommon homeTypeObj;
     private String homeTypeKey;
     private String homeTypeValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("基础表单sid")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml

@@ -23,7 +23,9 @@
                thisEndDate,
                relationValue,
                peoNum,
-               homeTypeValue
+               homeTypeValue,
+               expectCost,
+               costRemarks
         from ad_expatriates_home_apply
         where sid = #{sid}
     </select>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -71,6 +72,10 @@ public class AdExpatriatesHomeApplyVo implements Vo {
     private FormCommon homeTypeObj;
     private String homeTypeKey;
     private String homeTypeValue;
+    @ApiModelProperty("预计费用")
+    private BigDecimal expectCost;
+    @ApiModelProperty("费用明细")
+    private String costRemarks;
     @ApiModelProperty("备注")
     private String remarks;