【fix】配标器添加farmId 生成牧场编码补位

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -219,7 +219,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         }else {
             String maxDeviceCode = eartagDeviceRegisters.stream().max(Comparator.comparing(EartagDeviceRegister::getDeviceCode)).get().getDeviceCode();
             String substring = maxDeviceCode.substring(maxDeviceCode.length() - 6);
-            int code = Integer.parseInt(substring)+1;
+            int code = Integer.valueOf(substring)+1;
             String format = String.format("%6d", code);
 
             System.out.println("--------------------"+format);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/vo/EartagDeviceRegisterVo.java

@@ -22,6 +22,8 @@ public class EartagDeviceRegisterVo implements Serializable {
 
     private Integer id;
 
+    private String farmId;
+
     private String chipId;
 
     private String deviceCode;