Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop

lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftDay.java

@@ -2,6 +2,7 @@ package com.lzbi.draft.domain;
 
 import java.math.BigDecimal;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.lzbi.common.annotation.Excel;
 import com.lzbi.module.base.BaseModuleEntity;
@@ -44,10 +45,15 @@ public class DcBusiTargetDraftDay extends BaseModuleEntity
     @Excel(name = "统计单元名称")
     private String assetName;
 
-    /** 所属专业 */
-    @Excel(name = "所属专业")
-    private String fieldType;
+    @Excel(name = "所属专业编码")
+    private String fieldCode ;
+    /** 所属专业名称 */
+    @Excel(name = "所属专业名称")
+    private String fieldName ;
+    /** 指标别名 */
 
+    @Excel(name = "指标别名")
+    private String targetNameAlias ;
     /** 指标名称 */
     @Excel(name = "指标名称")
     private String targetName;