Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitan...

manailin

2022-09-14 29167f6c5d895749f369fadbcd4b3c0a3a17052c

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