Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-08-16 57e23c353a177b9c003a2f524a2adeaf641e2e4c

 zy-asrs-admin/src/views/strategy/shelvesRule/index.vue

@@ -27,6 +27,13 @@

const columns = [
        {
    title: formatMessage('db.strategy_shelves_rule.name', '规则名称'),
    dataIndex: 'name',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('name'),
  },
  {
            title: formatMessage('db.strategy_shelves_rule.rule_type', '规则类型'),
            dataIndex: 'ruleType$',
            width: 140,