Merge branch 'hive2.0' into score_shop

Helius

2021-04-06 1037ab6df799bd49c0f10adf1c048cd5ccc7e3e8

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