fix conflicts

new-ui/projects/vue-admin/src/views/Reward/api.ts

@@ -0,0 +1,17 @@
+import http from "@/http/config";
+
+export const getList = (params?: Record<string, unknown>) => {
+  return http({
+    url: "/api/admin/reward/list",
+    method: "get",
+    params
+  })
+}
+
+export const remove = (params?: Record<string, unknown>) => {
+  return http({
+    url: "/api/admin/reward/remove",
+    method: "get",
+    params
+  })
+}