Merge remote-tracking branch 'origin/master'

xuhy

2024-12-31 821a120c623aaac322ac7a1062bea9d78c596f67

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/src/main/java/com/jilongda/common/component/AliOssFileUploadController.java

 manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java

@@ -9,7 +9,6 @@
import com.aliyun.oss.model.PolicyConditions;
import com.aliyun.oss.model.PutObjectResult;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.component.AliOss;
import com.jilongda.common.utils.WebUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;