Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80

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