Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-29 02fecd88de1beaf80de66e07a0568da471dfd751

 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:[],
             }