From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java b/server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java
index 001cc11..4cfcad6 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java
@@ -89,7 +89,6 @@
                 model.setStrType("鏀嚭");
             }
             model.setStrObjType(Constants.IntegralObjType.getName(model.getObjType()));
-
         }
         ExcelExporter.build(Integral.class).export(list, "鐢ㄦ埛绉垎鏄庣粏"+ DateUtil.getNowLongTime(), response);
     }

--
Gitblit v1.9.3