From a88cf964159303c208d8a3a9d0b8dadef7b1388a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 10:34:45 +0800
Subject: [PATCH] Merge branch 'api' into order_reform

---
 zq-erp/src/main/java/com/matrix/system/app/dto/FollowupListDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/FollowupCommonetListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/FollowupListDto.java
similarity index 98%
rename from zq-erp/src/main/java/com/matrix/system/app/dto/FollowupCommonetListDto.java
rename to zq-erp/src/main/java/com/matrix/system/app/dto/FollowupListDto.java
index b61d760..722859f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/FollowupCommonetListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/FollowupListDto.java
@@ -15,7 +15,7 @@
  * @date 2020-12-23
  **/
 @ApiModel(value = "FollowupCommonetListDto", description = "跟进记录查询参数")
-public class FollowupCommonetListDto {
+public class FollowupListDto {
 
     @NotNull(message = "参数错误")
     @ApiModelProperty(value = "查询条数", example = "10")

--
Gitblit v1.9.1