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

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

@@ -235,7 +235,9 @@ public class EquipmentResourceLibrary extends Controller {
         boolean isDataAuth = content.getBooleanValue("isDataAuth");
 
         QuerySQL sqlFactory = SQLFactory.createQuerySQL(this, sat_sharematerial,
-                        "sat_sharematerialid", "title", "type", "status", "mailcount", "readcount", "downloadcount", "createdate", "checkdate", "sat_sharematerial_classids")
+                        "sat_sharematerialid", "title", "type", "status", "mailcount",
+                        "readcount", "downloadcount", "createdate", "checkdate",
+                        "sat_sharematerial_classids","ispicture")
                 .setTableAlias("t1");
         sqlFactory.setSiteid(siteid);
         sqlFactory.setWhere("classid", 3);