Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-12-08 ffb7ccc533993f6b4bfe22353c5ff19f11fa490f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java

@@ -42,4 +42,6 @@
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageSize;

    private String areaCode;
}