Merge remote-tracking branch 'origin/czks1.0' into czks1.0

src/main/java/com/zcloud/controller/filemanager/MfolderController.java

@@ -117,13 +117,17 @@ public class MfolderController extends BaseController {
 			pd.put("MFOLDER_ID", this.get32UUID());			//主键
 			pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//企业
 			mfolderService.save(pd);						//存入数据库表
-			pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+"@@"+fileName);
+			//存自己表里的附件 使用文件全路径加文件名的方式 示例
+			// /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg@@d3bc85d1bbe84b75b1e6e8b6182dc547.jpg
+			pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+
+					"@@"
+					+fileName);
 		}else{
 			errInfo = "fail";
 		}
 		map.put("result", errInfo);				//返回结果
 		map.put("dockData", JSON.toJSONString(pd));				//返回结果
-		map.put("sendPicturesList", JSON.toJSONString(pictureList));				//返回结果
+		map.put("sendPicturesList", JSON.toJSONString(pictureList));				//图片返回结果
 		return map;
 	}