Merge branch 'test_future_wangge' into test

CeDo

2021-06-07 fb1cd7f76d0d4bdca9ac5d5d0886b8e5314e52b6

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

@@ -29,6 +29,6 @@
    private Date payTimeEnd;
    @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单")
    private Long[] orderIds;
    @JsonIgnore
    @ApiModelProperty(hidden = true)
    private Long userId;
}