Merge branch 'lyq' into 'test'

罗元桥

2021-05-25 b24f9c75c79e4de248505295bfea7055e4975ff4

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