Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

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