Merge branch 'master' into wxw

Administrator

2024-03-02 18dfe607d34ecbc7881e8c80c8434354723d27c7

 HTML/views/ASNSetting/ArrivalNotice.html

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

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