Merge branch 'master' of gitee.com:youlaiorg/youlai-boot

# Conflicts:
#	src/main/java/com/youlai/boot/auth/security/config/SecurityConfig.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application-prod.yml

src/main/java/com/youlai/boot/device/controller/ContactController.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.device.controller;
 
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
 import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.result.Result;

src/main/java/com/youlai/boot/device/controller/DeviceController.java

@@ -1,6 +1,6 @@
 package com.youlai.boot.device.controller;
 
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
 import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.result.PageResult;

src/main/java/com/youlai/boot/device/controller/MobileController.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.controller;
 
 import cn.hutool.core.util.IdUtil;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.framework.annotation.Log;
 import com.youlai.boot.common.config.FilePath;
 import com.youlai.boot.common.enums.ActionTypeEnum;
 import com.youlai.boot.common.enums.LogModuleEnum;

src/main/java/com/youlai/boot/device/mapper/DeviceMapper.java

@@ -2,7 +2,7 @@ package com.youlai.boot.device.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.framework.annotation.DataPermission;
 import com.youlai.boot.device.model.entity.SnDeviceInfo;
 import com.youlai.boot.device.model.query.DeviceQuery;
 import com.youlai.boot.device.model.vo.DevicePageVO;

src/main/java/com/youlai/boot/device/model/entity/SnContact.java

@@ -2,7 +2,7 @@ package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnDeveloper.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnDevice.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnDeviceHardware.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnDeviceInfo.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnLocation.java

@@ -2,7 +2,7 @@ package com.youlai.boot.device.model.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/youlai/boot/device/model/entity/SnScreenshot.java

@@ -1,7 +1,7 @@
 package com.youlai.boot.device.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.boot.common.base.BaseEntity;
+import com.youlai.boot.framework.base.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;