Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

 ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -7,7 +7,7 @@
          <el-select v-model="info.tplCategory" @change="tplSelectChange">
            <el-option label="单表（增删改查）" value="crud" />
            <el-option label="树表（增删改查）" value="tree" />
            <el-option label="主子表（增删改查）" value="sub" />
<!--            <el-option label="主子表（增删改查）" value="sub" />-->
          </el-select>
        </el-form-item>
      </el-col>