Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382

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