Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.community.wallet;

import java.math.BigDecimal;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("用户结算收益请求参数")
@@ -19,6 +19,6 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty(value = "登录用户id",hidden = true)
    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;
}