Merge branch 'master' into test

puhanshu

2021-12-24 afd27e98fd0d3df475289c56bd96595d81fa5b9b

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

@@ -2,6 +2,7 @@

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -11,7 +12,7 @@
public class BigScreenGridStaticsReturn {
    private Integer count;
    private Integer num;
    private Integer percent;
    private BigDecimal percent;
    private String title;
    private List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList;
}