Merge remote-tracking branch 'origin/master'

doum

8 天以前 60e49d600834344ae1b18357e76df74fbe160527

Merge remote-tracking branch 'origin/master'

 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;

 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<>());

 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;

 server/web/src/main/resources/application.yml

@@ -1,6 +1,6 @@
# 端口器配置
server:
  port: 10011
  port: 11011
# 项目信息配置
project:
  name: 志邦点将