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

whycq

2022-12-05 0d549f0bb889983d2c6ab569a1304ac0c3fba6f6

 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>