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

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateOrderTime.html

@@ -83,7 +83,13 @@
   var myForm = MForm.initForm({
      invokeUrl : basePath+"/admin/order/updateOrderTime",
      afterSubmit : function(loj) {
         _p.myGrid.serchData();
         if(_p.myGrid) {
            _p.myGrid.serchData();
         }

         if (_p.app) {
            _p.app.orderQuery();
         }

      },
   });