Merge branch 'master' into positec

king

2024-07-02 bb79c0ec275c3aaafd45c8fae4be44b3cc7db308

 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx

@@ -446,7 +446,7 @@
      key: 'dataSource',
      label: '数据源',
      initVal: card.dataSource || '',
      placeholder: '系统变量：mk_departmentcode、mk_organization、mk_user_type。公共值@BID@。',
      placeholder: '系统变量：mk_departmentcode、mk_organization、mk_user_type。公共值：@BID@、@Appkey@、@UserID@、@SessionUid@、@LoginUID@、@lang@。',
      required: true,
    },
    {