Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

 zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html

@@ -80,7 +80,13 @@
   var myForm=MForm.initForm({
      invokeUrl:basePath+"/admin/projService/endPl",
      afterSubmit:function(){
         if (parent.myGrid) {
         parent.myGrid.serchData();
         }

         if (parent.app) {
            parent.app.serviceOrderQuery();
         }
      },
   });