Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -445,9 +445,9 @@ public class BoxKanbanController {
                 for (BoxStatusBean boxStatus : bean.getBoxStatus().values()) {
                 for (BoxStatusBean boxStatus : bean.getBoxStatus().values()) {
                     String humidity = boxStatus.getHumidity();
                     String humidity = boxStatus.getHumidity();
                     String temperature = boxStatus.getTemperature();
                     String temperature = boxStatus.getTemperature();
-                    boxDto.setHumidity(humidity);
+                    boxDto.setHumidity("-1".equals(humidity) ? "" + 0 : humidity);
                     boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
                     boxDto.setCodeAirTemp(boxStatus.getCodeAirTemp());
-                    boxDto.setTemperature(temperature);
+                    boxDto.setTemperature("-1".equals(temperature) ? "" + 0 : temperature);
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setStatus(bean.getStatus());
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setMsg(bean.getShowMsg(locale));
                     boxDto.setBarcode(bean.getCode());
                     boxDto.setBarcode(bean.getCode());