冲突合并

src/api/config.js

@@ -594,11 +594,8 @@ export default {
     'searchConcept': '/api/cdssman/klDisease/searchConcept',
     'findDisName': '/api/cdssman/klDisease/findDisName',
     'diseaseBaseSave': '/api/cdssman/klDisease/save',
-<<<<<<< HEAD
     'exportExcelTemplates': '/api/cdssman/importConcept/exportExcelTemplates',
     'exportTermExcel': '/api/cdssman/importConcept/exportTermExcel',
-=======
->>>>>>> scaleManage0527
     //静态知识术语
     'staticBaseKnowledge': '/api/cdssman/kl/conceptInfo/getPage',
     'changeBaseStatus': '/api/cdssman/kl/conceptInfo/changeStatus',
@@ -613,17 +610,14 @@ export default {
     'ruleExportExcel': '/api/cdssman/test/rule/ruleExportExcel',
     'autoRuleTest': '/api/cdssman/test/rule/ruleTest',
     'clearDrug': '/api/cdssman/cache/clearDrug',
-<<<<<<< HEAD
     //药品维护
     'getPageList': '/api/cdssman/klDrugRegister/getPage',
     'getsearchDrug': '/api/cdssman/klDrugRegister/searchDrug',
     'saveOrUpdate': '/api/cdssman/klDrugRegister/saveOrUpdate',
     'getByParam': '/api/cdssman/klDrugRegister/getByParam',
     'paramDelete': '/api/cdssman/klDrugRegister/delete',
-=======
     'klRegulation': '/api/cdssman/klRegulation/index'
 
->>>>>>> scaleManage0527
   },
   menuIconList: { //菜单对应图标
     'YH-KZT': 'el-icon-menu',