Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

src/pages/CommercialService/CardDetail.tsx

@@ -68,6 +68,7 @@ const CardDetail = (props: any) => {
           : values.replyContent,
       type: '7',
     };
+    console.log(tmp);
     RA(34, tmp, module, dispatch);
     setLoading(true);
   };

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -58,7 +58,7 @@ const Users = (props: any) => {
     {
       title: unit,
       render: (text: any, record: any) => (
-        <div>{record.buildingNumber + ' #' + record.floorNumber + '—' + record.roomNumber}</div>
+        <div>{record.buildingNumber + ' #' + record.floorNumber + '-' + record.roomNumber}</div>
       ),
     },
     {