Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

101captain

2022-03-07 da8cca4d320908b672f439369e65e9e6a95374e3

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