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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

 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);