Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

 screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java

@@ -72,7 +72,7 @@
        //处理时间以及content
        String[] contentArray = content.split(";");
        List<String> contentList = Arrays.asList(contentArray);
        String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
        String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd HH:mm:ss");

        vo.setAccount(account);
        vo.setContent(contentList);