feat：fix bugs

web/client/src/sections/fillion/components/patrolTable.js

@@ -998,11 +998,7 @@ const PatrolTable = (props) => {
 };
 
 function mapStateToProps(state) {
-<<<<<<< Updated upstream
     const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers, anspectionNotificationPhoneList } = state;
-=======
-    const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers } = state;
->>>>>>> Stashed changes
     const pakData = (dep) => {
         return dep.map((d) => {
             return {