Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

zhengyiming

10 天以前 506f4bcd2ce4f49b85ced24a24eeedbae3ee924a

 src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue

@@ -17,6 +17,7 @@
          v-model="form.field1"
          :value-enum="dictionaryDataList"
          enum-value-key="code"
          :convertEnumValue="false"
        />
      </ProFormItemV2>
      <ProFormItemV2 label="名称:" prop="content" :check-rules="[{ message: '请输入名称' }]">