Merge branch 'master' into wxw

Administrator

2024-03-05 b506c4535c62c4c5fd7c5b5c0bd7bb8b03390dbd

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -401,7 +401,7 @@
            elem: '#EndTime'
            , format: 'yyyy-MM-dd' //可任意组合
         });

			
         var h1 = GetTableTopHeight();
         var h2 = GetTableBottomHeight();