From 60e49d600834344ae1b18357e76df74fbe160527 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 二月 2026 10:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/LoginController.java | 1 -
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 1 +
server/web/src/main/resources/application.yml | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
index e268a1b..82ba88b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ImportRecordServiceImpl.java
@@ -22,7 +22,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.sun.xml.internal.messaging.saaj.util.ByteInputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellType;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 32314b2..4c30251 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -280,6 +280,7 @@
private void dealMemberCategoryList(Member member, List<Category> categoryList, Integer queryFlag) {
member.setFieldList(new ArrayList<>());
+ member.setFieldIdList(new ArrayList<>());
member.setTypeList(new ArrayList<>());
member.setZqList(new ArrayList<>());
member.setBustypeIdList(new ArrayList<>());
diff --git a/server/web/src/main/java/com/doumee/api/web/LoginController.java b/server/web/src/main/java/com/doumee/api/web/LoginController.java
index 80b7ca5..33cc68b 100644
--- a/server/web/src/main/java/com/doumee/api/web/LoginController.java
+++ b/server/web/src/main/java/com/doumee/api/web/LoginController.java
@@ -25,7 +25,6 @@
import com.doumee.dao.vo.WebLoginUserVO;
import com.doumee.service.business.CategoryService;
import com.doumee.service.business.MemberService;
-import com.sun.deploy.net.HttpUtils;
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index 04b0236..57a9549 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 绔彛鍣ㄩ厤缃�
server:
- port: 10011
+ port: 11011
# 椤圭洰淇℃伅閰嶇疆
project:
name: 蹇楅偊鐐瑰皢
--
Gitblit v1.9.3