Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecgboot-vue3-master/src/views/system/userZJ/user.data.ts

@@ -370,20 +370,8 @@ export const formSchema: FormSchema[] = [
     label: '比赛状态',
     field: 'stat',
     component: 'JSwitch',
-    componentProps:{
+    defaultValue: 'Y',
-      //开关大小，可选值：default small
+    componentProps: {},
-      size:'default',
-      //非选中时的内容
-      unCheckedChildren:'开启',
-      //非选中时的值
-      unCheckedValue:'Y',
-      //选中时的内容
-      checkedChildren:'关闭',
-      //选中时的值
-      checkedValue:'N',
-      //是否禁用
-      disabled: false
-    },
   },
 ];
 export const formPasswordSchema: FormSchema[] = [

jeecgboot-vue3-master/src/views/system/usercompexpert/user.data.ts

@@ -295,7 +295,10 @@ export const formSchema: FormSchema[] = [
     label: '比赛状态',
     field: 'stat',
     component: 'JSwitch',
-    componentProps:{
+    defaultValue: 'Y',
+    componentProps: {},
+/*    componentProps:{
+
       //开关大小，可选值：default small
       size:'default',
       //非选中时的内容
@@ -308,7 +311,7 @@ export const formSchema: FormSchema[] = [
       checkedValue:'N',
       //是否禁用
       disabled: false
-    },
+    },*/
   },
 ];
 export const formPasswordSchema: FormSchema[] = [