Merge remote-tracking branch 'origin/master'

xiejun

2023-12-06 08a7b7b2bdc4c61267642da6fdd34d0c46a43546

 Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/builder/oss/OssBuilder.java

@@ -21,7 +21,7 @@
import com.vci.ubcs.resource.entity.Oss;
import com.vci.ubcs.resource.service.IOssService;
import org.springblade.core.cache.utils.CacheUtil;
import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.enums.OssEnum;
import org.springblade.core.oss.enums.OssStatusEnum;
@@ -156,5 +156,4 @@
      }
   }


}