Merge remote-tracking branch 'origin/main'

This commit is contained in:
谷成伟 2024-12-27 11:16:38 +08:00
commit 17ad146458

View File

@ -529,8 +529,10 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
minioViewsServcie.uploadTemFile(minioAutoProperties.getPublicBucket(), scale, scaleParent); minioViewsServcie.uploadTemFile(minioAutoProperties.getPublicBucket(), scale, scaleParent);
SysEquipmentDocs sysEquipmentDocs = new SysEquipmentDocs(); SysEquipmentDocs sysEquipmentDocs = new SysEquipmentDocs();
sysEquipmentDocs.setUrl(parent); sysEquipmentDocs.setUrl(parent);
sysEquipmentDocs.setName(file.getOriginalFilename());
SysEquipmentDocs sysEquipmentDocsScale = new SysEquipmentDocs(); SysEquipmentDocs sysEquipmentDocsScale = new SysEquipmentDocs();
sysEquipmentDocsScale.setUrl(scaleParent); sysEquipmentDocsScale.setUrl(scaleParent);
sysEquipmentDocsScale.setName(file.getOriginalFilename());
result.add(sysEquipmentDocs); result.add(sysEquipmentDocs);
result.add(sysEquipmentDocsScale); result.add(sysEquipmentDocsScale);
} catch (Exception e) { } catch (Exception e) {