Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

lbq

5 小时以前 912b4dab5f847ab1108b18df1b5e06e85c71881e

 rsf-admin/src/page/basicInfo/loc/LocListAside.jsx

@@ -67,7 +67,7 @@
        if (row.flagWare === 1) {
            setFilters({ warehouseId: row.id, areaId: '' });
        } else if (row.flagWare === 0) {
            setFilters({ areaId: row.id, warehouseId: '' });
            setFilters({ areaId: row.id, warehouseId: row.warehouseId });
        }

    };