Merge remote-tracking branch 'origin/master'

sinake

3 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java

@@ -242,20 +242,41 @@
    private Double amount;

    /**
     * 扣税金额
     * 劳务个税（原“扣税金额”）
     */
    @ApiModelProperty("扣税金额")
    @Excel(name = "扣税金额")
    @ApiModelProperty("劳务个税")
    @Excel(name = "劳务个税")
    private Double taxamount;

    /**
     * 税后金额
     * 劳务税后（原“税后金额”）
     */
    @ApiModelProperty("税后金额")
    @Excel(name = "税后金额")
    @ApiModelProperty("劳务税后")
    @Excel(name = "劳务税后")
    private Double taxedamount;

    /**
     * 增值税
     */
    @ApiModelProperty("增值税")
    @Excel(name = "增值税")
    private Double vatAmount;

    /**
     * 城建税
     */
    @ApiModelProperty("城建税")
    @Excel(name = "城建税")
    private Double cityTaxAmount;

    /**
     * 劳务税前金额
     */
    @ApiModelProperty("劳务税前金额")
    @Excel(name = "劳务税前")
    private Double laborPretaxAmount;

    /**
     * 预支金额
     */
    @ApiModelProperty("预支金额")