Merge branch 'hive2.0' into api

935090232@qq.com

2021-01-26 ae2efe9a1b627fcfbe61020e9e0a82470a3959d7

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

@@ -263,7 +263,7 @@
            }
             let formData={
                vipId:id,
                yyTime:moment(_this.yyTime).format("YYYY-DD-MM HH:mm"),
                yyTime:_this.yyTime,
                serviceItems:[],
             }