Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-28 e34cc8847f742e08106fae37fdf1dd91cd0aa170

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/page/basicInfo/companys/CompanysList.jsx

@@ -74,7 +74,7 @@
            { id: 'customer', name: 'common.field.customer' },
            { id: 'supplier', name: 'common.field.supplier' },
            { id: 'partners', name: 'common.field.partners' }
        ]} />,
        ]} alwaysOn />,
    <TextInput source="contact" label="table.field.companys.contact" />,
    <TextInput source="tel" label="table.field.companys.tel" />,
    <TextInput source="email" label="table.field.companys.email" />,

 rsf-admin/src/page/basicInfo/matnr/BatchModal.jsx

@@ -182,6 +182,7 @@
                                        onChange={(e) => handleChange(e.target.value, 'flagCheck')}
                                        label="table.field.matnr.flagCheck"
                                        source="flagCheck"
                                        defaultValue={1}
                                        choices={[
                                            { id: 0, name: ' 否' },
                                            { id: 1, name: ' 是' },