Merge branch 'knowledgeExtra_0521' into test

src/components/knowledgeExtra/RegisteredDrug.vue

@@ -38,7 +38,7 @@
         <el-table-column prop="standardCode" label="药品本位码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="insuranceType" label="医保类型" show-overflow-tooltip></el-table-column>
         <el-table-column prop="insuranceRemrk" label="医保备注" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="modifierName" label="操作人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="modifier" label="操作人" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column label="操作" width="120" fixed="right">
           <template slot-scope="scope">