Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-11-17 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44

 ruoyi-ui/src/views/genealogy/index.vue

@@ -101,8 +101,8 @@
        
      <el-table-column label="性别" prop="sex" sortable width="100" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.sex===1">男</span>
          <span v-if="scope.row.sex===0">女</span>
          <span v-if="scope.row.sex===0">男</span>
          <span v-if="scope.row.sex===1">女</span>
          <span v-if="scope.row.sex== null">——</span>
        </template>
      </el-table-column>
@@ -302,11 +302,11 @@

      },
      typeOption: [{
        value: '1',
        value: '0',
        label: '男',
      },
        {
          value: '0',
          value: '1',
          label: '女',
        }],
      typeOptions: [{