预算批复管理 预算费用管理 页面字段调整

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/BudgetCostDetail.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
@@ -53,6 +54,7 @@ public class BudgetCostDetail implements Serializable {
 	@ApiModelProperty(value = "所属部门")
 	private String sysOrgCode;
 	/**部门*/
+	@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
 	@Excel(name = "部门", width = 15)
 	@ApiModelProperty(value = "部门")
 	private String department;

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/vo/BudgetCostPages.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.oa.entity.BudgetCostDetail;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.ExcelCollection;
@@ -75,6 +76,7 @@ public class BudgetCostPages {
 	private String remark;
 	/**部门*/
 	@Excel(name = "部门", width = 15)
+	@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
 	@ApiModelProperty(value = "部门")
 	private String department;
 	/**费用资金类别*/
@@ -109,5 +111,9 @@ public class BudgetCostPages {
 	@Excel(name = "待支付金额", width = 15)
 	@ApiModelProperty(value = "待支付金额")
 	private java.math.BigDecimal toBePaidMoney;
+	/**备注*/
+	@Excel(name = "明细备注", width = 15)
+	@ApiModelProperty(value = "明细备注")
+	private String detailRemark;
 
 }