Merge remote-tracking branch 'origin/master'

 iailab-module-data/iailab-module-data-biz/src/main/resources/application-uat.yml

文件已删除

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java

@@ -30,7 +30,7 @@
        List<Object[]> result = new ArrayList<>();
        QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("outputid", outputId)
                .eq("predicttime", predictTime);
                .eq("predicttime", DateUtils.format(predictTime,timeFormat));
        MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
        if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
            return result;