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

jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/mapper/CompMapper.java

@@ -30,5 +30,5 @@ public interface CompMapper extends BaseMapper<Comp> {
     List<Comp> getAllCompByType(String compTypeId);
 
     @Update("UPDATE comp SET compweight = #{scoreold} WHERE id=#{id}")
-    void updatedatework(String id, int scoreold);
+    void updatedatework(@Param("id") String id, @Param("scoreold") int scoreold);
 }

jeecgboot-vue3-master/src/views/system/loginmini/MiniLogin.vue

@@ -112,13 +112,13 @@
                 </div>
               </div>
               <a-form @keyup.enter.native="loginHandleClick">
-               <!-- <div class="aui-flex aui-third-text">
+                <div class="aui-flex aui-third-text">
                   <div class="aui-flex-box aui-third-border">
                     <span>{{ t('sys.login.otherSignIn') }}</span>
                   </div>
-                </div>-->
-              <!--  <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
-                  <div class="aui-flex-box">
+                </div>
+                <div class="aui-flex" :class="`${prefixCls}-sign-in-way`">
+                  <!--<div class="aui-flex-box">
                     <div class="aui-third-login">
                       <a title="github" @click="onThirdLogin('github')"><GithubFilled /></a>
                     </div>
@@ -132,13 +132,13 @@
                     <div class="aui-third-login">
                       <a title="钉钉" @click="onThirdLogin('dingtalk')"><DingtalkCircleFilled /></a>
                     </div>
-                  </div>
+                  </div>-->
                   <div class="aui-flex-box">
                     <div class="aui-third-login">
                       <a title="微信" @click="onThirdLogin('wechat_open')"><WechatFilled /></a>
                     </div>
                   </div>
-                </div>-->
+                </div>
               </a-form>
             </div>
           </div>

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

@@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+/*  {
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+ /* {
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

jeecgboot-vue3-master/src/views/system/userdep/userYX.data.ts

@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',

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

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     width: 120,
     customRender: render.renderAvatar,
   },
-  {
+  /*{
     title: '性别',
     dataIndex: 'sex',
     width: 80,
@@ -33,7 +33,7 @@ export const columns: BasicColumn[] = [
     title: '生日',
     dataIndex: 'birthday',
     width: 100,
-  },
+  },*/
   {
     title: '手机号',
     dataIndex: 'phone',