Merge remote-tracking branch 'origin/dev-2.0.1' into dev-2.0.1

liujie

2025-05-20 39faeb972b20562bf2f0b7b8cc4474ea8a3998e1

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

@@ -38,4 +38,6 @@
    @Min(value = 1)
    private Long pageSize;

    private String areaCode;

}