merge

colexiu-report-share.html

@@ -10,11 +10,7 @@
   <!-- <link href="https://fonts.loli.net/css2?family=Roboto:wght@700&display=swap" rel="stylesheet"> -->
   <script>
     this.globalThis || (this.globalThis = this)
-<<<<<<< HEAD
-  </script>
-=======
   </script>  
->>>>>>> gyt-feature-tianyong
   <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1279349593'%3E%3C/span%3E%3Cscript src='https://s9.cnzz.com/z_stat.php%3Fid%3D1279349593%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>
   <script type="text/javascript">
     // if (window.location.hostname !== 'mstuonline.dayaedu.com') {

colexiu-report.html

@@ -11,11 +11,7 @@
   <link href="/vant.css" rel="stylesheet">
   <script>
     this.globalThis || (this.globalThis = this)
-<<<<<<< HEAD
-  </script>
-=======
   </script>  
->>>>>>> gyt-feature-tianyong
   <script>
     function getBroswer() {
       var Sys = {};

colexiu-share.html

@@ -8,11 +8,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
   <script>
     this.globalThis || (this.globalThis = this)
-<<<<<<< HEAD
-  </script>
-=======
   </script>  
->>>>>>> gyt-feature-tianyong
   <style>
     #loading{
       position: fixed;