Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-26 43c69b2a7ee65a2664b5749cd33cdd3afe50d791

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopFundsSearchDTO.java

@@ -30,6 +30,6 @@
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数",example = "10", required = true)
    private Long pageSize;
    @JsonIgnore
    @ApiModelProperty(hidden = true)
    private Long userId;
}