Merge remote-tracking branch 'origin/master'

cloud-platform-main/src/main/java/com/huimv/modular/eartagregister/controller/EartagRegisterController.java

@@ -135,15 +135,16 @@ public class EartagRegisterController{
             return errorResponseData;
         }
 
-        String[] as = eartagNoList.split(",");
 
+        String[] as = eartagNoList.split(",");
+        System.out.println(eartagNoList);
         LambdaQueryWrapper<EartagRegister> wrapper13 = Wrappers.lambdaQuery();
         wrapper13.in(EartagRegister::getEartagNo ,   as);
         List<EartagRegister> eartagRegisters = eartagRegisterMapper.selectList(wrapper13);
         if(eartagRegisters.size()!=0) {
             List<String> eartagRegiste = new ArrayList<>();
             for ( EartagRegister eartagRegister : eartagRegisters) {
-                eartagRegiste.add(eartagRegister.getDeviceCode());
+                eartagRegiste.add(eartagRegister.getEartagNo());
             }
             ErrorResponseData errorResponseData = new ErrorResponseData("添加失败，耳标存在重复,重复编码为 "+eartagRegiste);
             return errorResponseData;

cloud-platform-main/src/main/resources/application-local.yml

@@ -11,7 +11,6 @@ spring:
     password: hm123456
 
 
-
 # Oracle数据库
 #spring:
 #  datasource: