Merge remote-tracking branch 'origin/master'

xuhy

2025-01-01 d5cd8f5f7a981ea9e40d73017905588d1cb6b5c1

 manage/src/main/java/com/jilongda/manage/model/TOrderAccounting.java

@@ -56,7 +56,7 @@

    @ApiModelProperty(value = "手续费")
    @TableField("commission")
    private Integer commission;
    private BigDecimal commission;

    @ApiModelProperty(value = "镜片右毛利")
    @TableField("rLensProfit")
@@ -72,7 +72,8 @@

    @ApiModelProperty(value = "实收金额")
    @TableField("payMoney")
    private String payMoney;
    private BigDecimal payMoney;


    @ApiModelProperty(value = "本单毛利")
    @TableField("profitMoney")