Merge branch 'master' of gitee.com:youlaiorg/youlai-boot
# Conflicts: # src/main/java/com/youlai/boot/config/SecurityConfig.java # src/main/java/com/youlai/boot/config/property/TencentSmsProperties.java # src/main/java/com/youlai/boot/support/sms/impl/AliyunSmsServiceImpl.java # src/main/java/com/youlai/boot/support/sms/impl/TencentSmsService.java # src/main/resources/application-dev.yml # src/main/resources/application-prod.yml
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.youlai.boot.device.controller;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.youlai.boot.framework.annotation.Log;
|
||||
import com.youlai.boot.common.annotation.Log;
|
||||
import com.youlai.boot.common.config.FilePath;
|
||||
import com.youlai.boot.common.enums.ActionTypeEnum;
|
||||
import com.youlai.boot.common.enums.LogModuleEnum;
|
||||
|
||||
Reference in New Issue
Block a user