Merge remote-tracking branch 'origin/develop-yellow' into develop2

src/custom/restcontroller/webmanage/saletool/sharematerial/EquipmentResourceLibrary.java

@@ -518,7 +518,8 @@ public class EquipmentResourceLibrary extends Controller {
         EmailContent emailContent = new EmailContent();
         emailContent.addText(rows.get(0).getString("content"));
         for (Row rowAtt : rowsAtt) {
-            emailContent.addFile(rowAtt.getString("url"));
+            emailContent.addText("下载链接："+rowAtt.getString("url"));
+            emailContent.addBr();
         }
         Remind remind = new Remind(siteid);
         remind.setTitle(rows.get(0).getString("title"));