Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

16 小时以前 ba173949df6bf3f0a5a39e04e8265cd43c9cede4

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java

@@ -178,7 +178,7 @@
            for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
                TelecomJkCabinetLogVO telecomJkCabinetLogVO = new TelecomJkCabinetLogVO();
                BeanUtil.copyProperties(jkCabinetLog,telecomJkCabinetLogVO);
                telecomJkCabinetLogVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ZERO:Constants.ONE);
                telecomJkCabinetLogVO.setStatus(Objects.nonNull(jkCabinetLog.getReturnDate())?Constants.ONE:Constants.ZERO);
                telecomJkCabinetLogVOList.add(telecomJkCabinetLogVO);
            }
        }