Merge remote-tracking branch 'origin/master'

mayf

2024-10-12 53ac595354d7e577acd48dff19470b73b892c8cf

 pages/shop/list.vue

@@ -63,9 +63,10 @@
              },
              { label: '手机号', id: 'tel', type: 'input' },
              {
                label: '启动/禁用',
                label: '启用/禁用',
                id: 'isEnabled',
                type: 'bus-select-dict',
                default: '1',
                el: {
                  code: 'USER_ENABLED_OR_DISABLED',
                  clearable: true,