Merge branch 'master' into master

jeecgboot-vue3/src/views/demo/jeecg/jeecgComponents.data.ts

@@ -258,6 +258,20 @@ export const schemas: FormSchema[] = [
     label: '选中用户',
     colProps: { span: 12 },
   },
+  {
+    field: 'user4',
+    component: 'JSelectUserByDepartment',
+    label: '部门选择用户',
+    helpMessage: ['component模式'],
+    defaultValue: '',
+    componentProps: {
+      labelKey: 'realname',
+      rowKey: 'username',
+    },
+    colProps: {
+      span: 12,
+    },
+  },
   {
     field: 'role2',
     component: 'JSelectRole',

jeecgboot-vue3/src/views/system/notice/notice.data.ts

@@ -144,7 +144,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'userIds',
     label: '指定用户',
-    component: 'JSelectUser',
+    component: 'JSelectUserByDepartment',
     required: true,
     componentProps: {
       rowKey: 'id',