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

lidongdong

2022-11-01 2cc4ff419e5ad9abdc70556146adb4af4d258af3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/EventRateVO.java

@@ -15,5 +15,6 @@
    private BigDecimal rate;
    @ApiModelProperty("数量")
    private Integer count;
    private Integer currentProcessType;
    private Integer type;
}