Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-26 c42165204bda966c32f6c5e6cba7a978e08922e7

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

@@ -302,7 +302,7 @@
                  }

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

                  _this.closeFrame();