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/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()
                });
            });