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

sgzb-ui/src/api/base/base.js

@@ -154,6 +154,22 @@ export function unitTypeList(query) {
     params: query
   })
 }
+// 标签编号-列表
+export function getMaMachineLabelApi(query) {
+  return request({
+    url: '/base/maMachineLabel/list',
+    method: 'get',
+    params: query
+  })
+}
+//单位类型--新增
+export function addMaMachineLabelApi(data) {
+  return request({
+    url: '/base/maMachineLabel',
+    method: 'post',
+    data: data
+  })
+}
 // 单位类型-详情
 export function unitTypeDetail(query) {
   return request({