Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

@@ -276,7 +276,13 @@
         var total = parseFloat($("#zkTotal").html());
      },
      afterSubmit : function() {
         parent.myGrid.serchData();
         if(parent.myGrid) {
            parent.myGrid.serchData();
         }

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