yinruoxi

修改：
  1.快递外卖代码冲突

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/feign/RemoteDigitalmanService.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @author yrx
  */
 @FeignClient(contextId = "remoteDigitalmanService", value = ServiceConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteDigitalmanService {
+public interface  RemoteDigitalmanService {
 
     /**
      * 同步数字人信息 | 内部调用

xueyi-common/xueyi-common-core/src/main/java/com/xueyi/common/core/constant/digitalman/SkillConstants.java

@@ -20,7 +20,8 @@ public class SkillConstants {
         REGISTER_VISITOR("3", "访客到访登记"),
         INTRODUCE_STRANGER("24", "熟人介绍生人"),
         BROADCAST_DISPLAY("25", "播报展示"),
-        OPEN_DOOR("26", "开门");
+        OPEN_DOOR("26", "开门"),
+        DELIVERY("33", "寄快递");
 
         private final String code;
         private final String info;

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java

@@ -43,10 +43,7 @@ import com.xueyi.nlt.nlt.domain.vo.IntentTemplateVo;
 import com.xueyi.nlt.nlt.domain.vo.MarkRecordVo;
 import com.xueyi.nlt.nlt.mapper.DmRegularMapper;
 import com.xueyi.nlt.nlt.service.IDmIntentService;
-import com.xueyi.nlt.nlt.template.FreeChatTemplate;
-import com.xueyi.nlt.nlt.template.GenerativeKnowledgeTemplate;
-import com.xueyi.nlt.nlt.template.MeetingOrderTemplate;
-import com.xueyi.nlt.nlt.template.MovieChatTemplate;
+import com.xueyi.nlt.nlt.template.*;
 import com.xueyi.system.api.digitalmans.domain.dto.DmManDeviceDto;
 import com.xueyi.system.api.digitalmans.domain.dto.DmSkillDto;
 import com.xueyi.system.api.digitalmans.domain.vo.DmBatchQuestionsVo;