Merge pull request 'm' (#13) from yanyang into master

Reviewed-on: #13

ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java

@@ -6,7 +6,6 @@
 package com.cnbm.admin.base;
 
 import com.alibaba.fastjson.JSON;
-import com.cnbm.admin.dto.LoginUserDTO;
 import com.cnbm.admin.entity.LoginUser;
 import com.cnbm.admin.enums.WhetherEnum;
 import lombok.Builder;

ym-admin/src/main/java/com/cnbm/admin/dto/LoginUserDTO.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2018.
- * http://www.ulabcare.com
- */
-
-package com.cnbm.admin.dto;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * @author jiff
- * @date 2018/11/1
- * @since 1.0
- */
-@EqualsAndHashCode(callSuper = false)
-@Builder
-@Data
-@Accessors(chain = true)
-public class LoginUserDTO implements Serializable {
-    public static final String HTTP_HEADER_NAME = "loginUser";
-    public static final int USER_TYPE_PLATFORM = 1;
-    public static final int USER_TYPE_PARTNER = 2;
-    public static final int USER_TYPE_HOSPITAL = 3;
-    public static final int USER_TYPE_PATIENT = 4;
-    /**
-     * 会话ID
-     */
-    private String sessionId;
-    private Long passportUserId;
-    private Long userId;
-    private Long partnerId;
-    private Long hospitalId;
-    private Long orgId;
-    private String mobile;
-    private String userName;
-    /**
-     * 用户类型
-     */
-    private int userType;
-    /**
-     * 应用类型
-     */
-    private int appType;
-    /**
-     * 应用代码
-     */
-    private int appCode;
-    /**
-     * 登录类型：1、自主登录，2、漫游登录
-     */
-    private int loginType;
-    /**
-     * 微信appId
-     */
-    private String wechatAppId;
-    /**
-     * 微信openId
-     */
-    private String openId;
-}

ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java

@@ -1,7 +1,6 @@
 package com.cnbm.admin.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.cnbm.admin.dto.LoginUserDTO;
 import com.cnbm.admin.entity.LoginUser;
 import com.cnbm.admin.entity.SysLogLoginEntity;
 import com.cnbm.admin.enums.LoginOperationEnum;
@@ -11,7 +10,6 @@ import com.cnbm.admin.service.CaptchaService;
 import com.cnbm.admin.service.SysLogLoginService;
 import com.cnbm.admin.utils.JwtUtil;
 import com.cnbm.admin.service.LoginService;
-import com.cnbm.admin.utils.ResponseResult;
 import com.cnbm.common.exception.ErrorCode;
 import com.cnbm.common.utils.IpUtils;
 import com.cnbm.common.utils.Result;

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java

@@ -86,8 +86,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
     @Transactional(rollbackFor = Exception.class)
     public IdVo add(WoPackagingBoxDTO dto) {
         WoPackagingBox entity = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class);
-        insert(entity);
         baseSupport.setCommonField(entity);
+        insert(entity);
         return IdVo.builder().id(entity.getId()).build();
     }