Merge remote-tracking branch 'origin/bfasrs' into bfasrs

whycq

2023-01-30 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7

 src/main/webapp/views/report/viewInOut.html

@@ -11,7 +11,7 @@
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <style>
        #btn-export {
            float:initial !important;
            margin-top: 10px;
        }
    </style>
</head>