Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 2a5dff9ff1af974d6bda826da75ca8073c25013f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @description: 实有单位
@@ -24,7 +25,7 @@
    private String category;

    @ExcelProperty(value = "占地面积" ,index = 3)
    private String square;
    private BigDecimal square;

    @ExcelProperty(value = "数量" ,index = 4)
    private Integer num;