修复机器申请失败的问题

src/main/java/com/szwl/controller/IndexController.java

@@ -174,11 +174,13 @@ public class IndexController { ;
         if (list.size() > 0) {
             TEquipment equipment = list.get(0);
             if(equipment.getAdminId()!=31){
-                String managerId1 = equipment.getManagerId();
-                if(!managerId.equals(managerId1)){
-                    return "该设备未脱离";
-                }else {
-                    return "该设备已经初始化";
+                if(!equipment.getClientId().substring(equipment.getClientId().length()-3,equipment.getClientId().length()).equals("xxx")){
+                    String managerId1 = equipment.getManagerId();
+                    if(!managerId.equals(managerId1)){
+                        return "该设备未脱离";
+                    }else {
+                        return "该设备已经初始化";
+                    }
                 }
             }else {
                 status = "1";

src/main/java/com/szwl/controller/TAdminController.java

@@ -408,7 +408,7 @@ public class TAdminController {
             tMessageCode.setStatus("1");
             admin.setCreateDate(new Date());
             admin.setModifyDate(new Date());
-            admin.setIsAdmined(false);
+            admin.setIsAdmined(true);
             admin.setIsEnabled(true);
             admin.setLoginFailureCount(0);
             admin.setIsLocked(false);

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -176,7 +176,7 @@ public class TEquipmentController {
                 equipmentDTO.setRedSugar(equipmentDesc.getRedSugar());
                 equipmentDTO.setWasteWater(equipmentDesc.getWasteWater());
                 equipmentDTO.setWater(equipmentDesc.getWater());
-                equipmentDTO.setYellowSugar(equipmentDTO.getYellowSugar());
+                equipmentDTO.setYellowSugar(equipmentDesc.getYellowSugar());
                 equipmentDTO.setBlueSugar(equipmentDesc.getBlueSugar());
                 equipmentDTO.setIsMaterialUse(equipmentDesc.getIsMaterialUse());
                 equipmentDTO.setStick(equipmentDesc.getStick());