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

pz-system/src/main/java/com/pz/system/service/impl/SysOssServiceImpl.java

@@ -67,6 +67,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
             SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
             if (ObjectUtil.isNotNull(vo)) {
                 list.add(this.matchingUrl(vo));
+            } else {
+                list.add(baseMapper.selectVoById(id));
             }
         }
         return list;