From e6457b48460f8be6cbc2f5b1ce1ec070f8f5393f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=96=87=E9=A3=9E?= <347907836@qq.com>
Date: Mon, 15 Dec 2025 20:53:18 +0800
Subject: [PATCH] commit

---
 ruoyi-admin/src/main/resources/application.yml                  | 2 +-
 .../main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java  | 2 +-
 .../java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java    | 2 +-
 .../main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java  | 2 +-
 .../com/ruoyi/contract/service/impl/ConSaleServiceImpl.java     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7fa61f3..c55971a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -75,7 +75,7 @@ spring:
     basename: i18n/messages
   profiles:
     #        active: dev
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java
index e5f7c00..a4d18cb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConSaleMediaBo.java
@@ -203,5 +203,5 @@ public class ConSaleMediaBo extends BaseEntityAdd {
      */
     @CustomBaenAnnotation(value = "其他返点金额2")
     @Digits(integer = 15,fraction = 4,message = "其他返点金额2最多允许15位整数,4位小数")
-    private BigDecimal otherReverMoney2;
+    private Double otherReverMoney2;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
index cc4dc6b..b525df4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/dto/ConSaleImportDto.java
@@ -89,7 +89,7 @@ public class ConSaleImportDto implements Serializable {
     private String otherReverPoit2 = "0";
 
     @Alias("其他返点金额2")
-    private BigDecimal otherReverMoney2 = BigDecimal.ZERO;
+    private Double otherReverMoney2 = 0.0;
 
     @Alias("开票时间")
     private String invoiceDate;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java
index 7410d4d..22ff316 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java
@@ -186,5 +186,5 @@ public class ConSaleMediaVo {
      * 其他返点金额2
      */
     @ExcelProperty(value = "其他返点金额2")
-    private BigDecimal otherReverMoney2;
+    private Double otherReverMoney2;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
index 6f94207..67d86a7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConSaleServiceImpl.java
@@ -233,7 +233,7 @@ public class ConSaleServiceImpl implements IConSaleService {
             mediaBo.setOtherReverPoit(StrUtil.isNotBlank(row.getOtherReverPoit()) ? row.getOtherReverPoit() : "0");
             mediaBo.setOtherReverMoney(ObjectUtil.isNotNull(row.getOtherReverMoney()) ? row.getOtherReverMoney() : 0.0);
             mediaBo.setOtherReverPoit2(StrUtil.isNotBlank(row.getOtherReverPoit2()) ? row.getOtherReverPoit2() : "0");
-            mediaBo.setOtherReverMoney2(ObjectUtil.isNotNull(row.getOtherReverMoney2()) ? row.getOtherReverMoney2() : BigDecimal.ZERO);
+            mediaBo.setOtherReverMoney2(ObjectUtil.isNotNull(row.getOtherReverMoney2()) ? row.getOtherReverMoney2() : 0.0);
 
             // 解析日期
             try {