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

yanghui

2022-10-21 ef676e6bff9e9fa9d95a8f621e9dbbbdf690e718

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

@@ -13,4 +13,5 @@
    private Integer yellowMark;
    private Integer greenMark;
    private Integer travelCount;
    private Integer outsideCount;
}