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

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 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(){
         parent.myGrid.serchData();
         if (parent.myGrid) {
            parent.myGrid.serchData();
         }

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