Merge branch 'crm-msg' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev

# Conflicts:
#	src/views/crm/backlog/tables/TodayCustomer.vue

src/api/crm/backlog/index.ts

@@ -0,0 +1,18 @@
+import request from '@/config/axios'
+
+import { type CustomerVO } from '../customer'
+import { type ClueVO } from '../clue'
+
+
+// 查询客户列表
+// TODO @芋艿：看看是不是后续融合到 getCustomerPage 里；
+export const getTodayCustomerPage = async (params) => {
+  return await request.get({ url: `/crm/backlog/today-customer-page`, params })
+}
+
+// 查询线索列表
+export const getFollowLeadsPage = async (params) => {
+  return await request.get({ url: `/crm/backlog/page`, params })
+}
+
+export  { type CustomerVO, type ClueVO }

src/api/crm/message/index.ts

@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-export interface CustomerVO {
-  id?: number
-  name: string
-  industryId: number
-  level: number
-  source: number
-  followUpStatus?: boolean
-  lockStatus?: boolean
-  dealStatus?: boolean
-  mobile: string
-  telephone: string
-  website: string
-  qq: string
-  wechat: string
-  email: string
-  description: string
-  remark: string
-  ownerUserId?: number
-  ownerUserName?: string
-  ownerUserDept?: string
-  roUserIds?: string
-  rwUserIds?: string
-  areaId?: number
-  areaName?: string
-  detailAddress: string
-  contactLastTime?: Date
-  contactNextTime: Date
-  createTime?: Date
-  updateTime?: Date
-  creator?: string
-  creatorName?: string
-}
-
-// 查询客户列表
-// TODO @芋艿：看看是不是后续融合到 getCustomerPage 里；
-export const getTodayCustomerPage = async (params) => {
-  return await request.get({ url: `/crm/message/todayCustomer`, params })
-}