Merge branch 'test' into 'master'

罗元桥

2021-06-30 ba00ab27db7226ae512be41928ae57c6f2a16db2

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

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