From d5cd8f5f7a981ea9e40d73017905588d1cb6b5c1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 01 一月 2025 14:52:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TOrderAccounting.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrderAccounting.java b/manage/src/main/java/com/jilongda/manage/model/TOrderAccounting.java
index f90621d..0f12f0d 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrderAccounting.java
+++ b/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")
--
Gitblit v1.7.1