Merge branch 'test' of https://gitee.com/jyyforjava/zq-erp into test

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

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