Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-22 28e168f05d3eb48223e69064188c6fce786442d4

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java

@@ -120,6 +120,9 @@
    @Excel(name = "项目状态")
    private String status;

    /** 统计状态数量 */
    private Integer statusNumber;

    /** 是否删除 */
    @Excel(name = "是否删除")
    private String isDeleted;
@@ -149,6 +152,7 @@

    /** 数据来源 */
    private String dataSource;


    public Integer getHoleNum() {
      return holeNum;
@@ -300,7 +304,16 @@
    {
        return status;
    }
    public void setIsDeleted(String isDeleted) 

    public Integer getStatusNumber() {
        return statusNumber;
    }

    public void setStatusNumber(Integer statusNumber) {
        this.statusNumber = statusNumber;
    }

    public void setIsDeleted(String isDeleted)
    {
        this.isDeleted = isDeleted;
    }