Merge branch 'dev-mobh' into develop

src/main/java/cn/timer/api/controller/oss/OSSController.java

@@ -155,10 +155,9 @@ public class OSSController {
 	@ApiOperation(value = "删除多个(谨慎使用，谨慎使用)", httpMethod = "DELETE", notes = "接口发布说明")
 	@ApiOperation(value = "删除多个(谨慎使用，谨慎使用)", httpMethod = "DELETE", notes = "接口发布说明")
 	public Result<List<String>> delFiles(@CurrentUser UserBean userBean, @RequestBody OssDto ossDto) {
 	public Result<List<String>> delFiles(@CurrentUser UserBean userBean, @RequestBody OssDto ossDto) {
 		List<String> list = null;
 		List<String> list = null;
-		List<String> keys = null;
 		try {
 		try {
+			List<String> keys = new ArrayList<String>();
 			for (String fileName : ossDto.getFileNames()) {
 			for (String fileName : ossDto.getFileNames()) {
-				keys = new ArrayList<String>();
 				String key = "8timer2.0/" + userBean.getOrgCode() + "/" + ossDto.getMoudle() + "/" + fileName;
 				String key = "8timer2.0/" + userBean.getOrgCode() + "/" + ossDto.getMoudle() + "/" + fileName;
 				keys.add(key);
 				keys.add(key);
 			}
 			}