Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-08 a55c085909b5391345db56cffaf867620d108210

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberAdminVO.java

@@ -4,9 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("管理后台-网格员返回参数")
public class EventGridMemberAdminVO {