Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-20 c733d08b2ddcbda4bd688bde38713887ebe91244

 business/src/main/java/com/ycl/domain/entity/ProjectInfo.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
@@ -33,9 +34,17 @@
    /** 建设内容 */
    private String content;

    @TableField("construction_nature")
    /** 建设性质 */
    private String constructionNature;

    @TableField("project_type")
    /** 项目类型（0房屋建筑，1城市基础设施，2交通运输，3水利，4能源，5非煤矿山，6其他） */
    /** 项目类型 */
    private String projectType;

    @TableField("project_sub_type")
    /** 项目子类型 */
    private String projectSubType;

    @TableField("project_status")
    /** 项目状态  (0未开工，1已开工，2已竣工，3暂停) */
@@ -97,17 +106,17 @@
    /** 计划竣工时间 */
    private Date planCompleteTime;

    @TableField("win_unit")
    /** 中标单位 */
    private String winUnit;

    @TableField("win_amount")
    /** 中标金额 */
    private String winAmount;

    @TableField("win_time")
    /** 中标时间 */
    private Date winTime;
//    @TableField("win_unit")
//    /** 中标单位 */
//    private String winUnit;
//
//    @TableField("win_amount")
//    /** 中标金额 */
//    private String winAmount;
//
//    @TableField("win_time")
//    /** 中标时间 */
//    private Date winTime;

    @TableField("project_address")
    /** 详细地址 */
@@ -151,4 +160,10 @@
    @TableField("remark")
    /** 审核信息 */
    private String remark;
    @TableField("industry_competent_department")
    private Long industryCompetentDepartment;
    @TableField("industry_competent_department_person")
    private Long industryCompetentDepartmentPerson;
    @TableField("department_person_phone")
    private String departmentPersonPhone;
}