Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 06ceee5a4f820ebb19dd66388c958d8638fa1b54

 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;
}