Merge remote-tracking branch 'origin/master'

src/api/canteen/canteenSpu.ts

@@ -1,59 +1,56 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/selectPage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function fetchErpList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/erp/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/erp/page",
+		method: "get",
+		params: query,
+	})
 }
 
-
 export function fetchSimpleList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/getCanteenSpuSimplePage',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/getCanteenSpuSimplePage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/canteen/canteenSpu/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/canteen/canteenSpu/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "put",
+		data: obj,
+	})
 }
-
-

src/api/hard/hard-mq.ts

@@ -0,0 +1,12 @@
+import request from "/@/utils/request"
+
+/**
+ * 同步超市消费机分类和商品变化
+ */
+export function syncSupermarket(params: any) {
+    return request({
+        url: "/hard/hard-sync/sync-supermarket",
+        method: "get",
+        params: params,
+    })
+}