Merge branch 'hemenkou_dev' into dev

101captain

2022-02-21 5a278a0965b417e7f39e8c209e2ff401f415066a

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