Merge branch 'master' of http://173.18.12.196:3000/front/platformFront

src/components/basicKnow/AddTerm.vue

@@ -1546,6 +1546,7 @@ export default {
       drugTypeList: [
         { val: 0, name: "西药" },
         { val: 1, name: "中成药" },
+        { val: 2, name: "中草药" },
       ], //药品类型
       drug: "",
       dioTypeList: [], //更多信息-类型

vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 
 // const proxy_path = 'http://172.16.8.64:5050';
 //const proxy_path = 'http://173.18.12.192:5050';
-const proxy_path = 'http://173.18.12.195:5050';
+const proxy_path = 'http://173.18.12.192:5050';
 
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.113:5050'; //王峰