Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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

@@ -176,7 +176,13 @@
                c : false
            }).invoke(basePath+"/admin/projService/hkService?id="+id, function(loj) {
                layer.msg(loj.getValue("info"),{icon:1,time:2000},function(){
                    parent.myGrid.serchData();
                    if (parent.myGrid) {
                        parent.myGrid.serchData();
                    }

                    if (parent.app) {
                        parent.app.serviceOrderQuery();
                    }
                    MTools.closeForm()
                });
            });