Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-07 d05e79f08a584bac02dc5994c5786863e47b2be4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageInputUserDTO.java

@@ -27,10 +27,10 @@
    private String areaName;

    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize;
    private Long pageSize = 10L;

    @ApiModelProperty("标签")
    private String tags;