diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java
index fc32865e..9aa8a401 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java
@@ -20,13 +20,13 @@ public class PinkDto implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Long uid;
 
-    @ApiModelProperty(value = "拼图总人数")
+    @ApiModelProperty(value = "拼团总人数")
     private Integer people;
 
     @ApiModelProperty(value = "拼团产品单价")
     private Double price;
 
-    @ApiModelProperty(value = "拼图结束时间")
+    @ApiModelProperty(value = "拼团结束时间")
     private Date stopTime;
 
     @ApiModelProperty(value = "拼团用户昵称")
@@ -38,13 +38,13 @@ public class PinkDto implements Serializable {
     @ApiModelProperty(value = "参与的拼团的id集合")
     private String count;
 
-    @ApiModelProperty(value = "拼图时效：小时")
+    @ApiModelProperty(value = "拼团时效：小时")
     private String h;
 
-    @ApiModelProperty(value = "拼图时效：分钟")
+    @ApiModelProperty(value = "拼团时效：分钟")
     private String i;
 
-    @ApiModelProperty(value = "拼图时效：秒")
+    @ApiModelProperty(value = "拼团时效：秒")
     private String s;
 
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java b/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java
index eb5e03b1..897b7bfd 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java
@@ -41,7 +41,7 @@ public class OrderParam implements Serializable {
     @ApiModelProperty(value = "门店电话")
     private String phone;
 
-    @ApiModelProperty(value = "拼团产品ID")
+    @ApiModelProperty(value = "拼团id 0没有拼团")
     private String pinkId;
 
     @ApiModelProperty(value = "门店联系人")
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
index 21b2857d..e80aebfc 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
@@ -82,7 +82,7 @@ public interface UserBillMapper extends CoreMapper<YxUserBill> {
             "from yx_user_bill b left join yx_user u on u.uid=b.uid  where 1=1  "  +
             "<if test =\"category !=''\">and b.category=#{category}</if> " +
             "<if test =\"type !=''\">and b.type=#{type}</if> " +
-            "<if test =\"title !=''\">and b.title=#{title}</if> " +
+            "<if test =\"title !=null\">and b.title=#{title}</if> " +
             "<if test =\"pm !=null\">and b.pm=#{pm}</if> " +
             "<if test =\"date !=null\">and b.create_time &gt;= STR_TO_DATE(#{date},'%Y-%m-%d %H:%i:%s')</if> " +
             "<if test =\"date1 !=null\">and b.create_time &lt;=STR_TO_DATE(#{date1},'%Y-%m-%d %H:%i:%s')</if> " +