Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

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