Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

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

      },
   });