Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 e09449ffcf303f67f5bbd168383b285600a251ec

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/index.html

@@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<meta http-equiv="Cache-Control" content="no-siteapp" />
<title>HIVE蜜米管理系统</title>
<title>讯聪管理系统</title>
<link rel="shortcut icon" href="${path }/resource/images/mm.ico">
<!--[if lt IE 8]>
    <meta http-equiv="refresh" content="0;ie.html" />