Merge branch 'master_118' into 'developer'

Master 118

See merge request !889

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -209,7 +209,7 @@ public class MaterialServiceImpl implements MaterialService {
           }
           String[] arr = null ;
           if(url.contains("?")) {
-              arr = url.split("?")[0].split("/") ;
+              arr = url.split("\\?")[0].split("/") ;
           }else {
              arr = url.split("/");
           }