Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

昨天 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-flow/src/page/loc/LocPanel.jsx

@@ -6,6 +6,7 @@
} from 'react-admin';
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common'
import { getCompDirectLabel } from "./compDirect";

const LocPanel = () => {
    const record = useRecordContext();
@@ -73,7 +74,7 @@
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.loc.compDirect" 
                                property={record.compDirect$}
                                property={getCompDirectLabel(translate, record.compDirect)}
                            />
                        </Grid>
                        <Grid item xs={6}>