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

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

 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;