生成二维码

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -348,9 +348,9 @@ public class MachineController {
         if(ptsMachine != null){
             json.put("isBeing",1);
             json.put("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
-            json.put("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
-        }else{
             json.put("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
+        }else{
+            json.put("isBeing",2);
         }
         return json;
     }