Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-22 245eb51063dca6bcb9c67c5b4b400b6f2b04453a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -7,6 +7,9 @@

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel
public class CommonPage {
@@ -46,4 +49,6 @@
    private Date statusEndTime;
    @ApiModelProperty("编号")
    private String serialNo;
    @ApiModelProperty("小区id")
    private Long areaId;
}