diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
index 2052cc9c..74d569be 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java
@@ -127,6 +127,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl
      * 创建时间
      **/
     @TableField(fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createDate;
     /**
      * 创建人
@@ -136,6 +138,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl
      * 更新时间
      **/
     @TableField(fill = FieldFill.UPDATE,insertStrategy = FieldStrategy.NEVER)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateDate;
     /**
      * 更新人
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index ec955920..439235d8 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -46,6 +46,9 @@
             <if test="params.quoteNo != null and params.quoteNo != ''">
                 and q.quote_no = #{params.quoteNo}
             </if>
+            <if test="params.quoteVersionNo != null and params.quoteVersionNo != ''">
+                and q.quote_version_no = #{params.quoteVersionNo}
+            </if>
             <if test="params.buNo != null and params.buNo != ''">
                 and q.bu_no = #{params.buNo}
             </if>
@@ -68,10 +71,10 @@
                 and p.project_desc like #{params.projectDesc}
             </if>
             <if test="params.purchase != null and params.purchase != ''">
-                and q.purchase like #{params.purchase}
+                and dbo.plm_get_user_display(q.site,q.purchase) like #{params.purchase}
             </if>
             <if test="params.quoter != null and params.quoter != ''">
-                and q.quoter like #{params.quoter}
+                and dbo.plm_get_user_display(q.site,q.quoter) like #{params.quoter}
             </if>
             <if test="params.customerInquiryNo != null and params.customerInquiryNo != ''">
                 and q.customer_inquiry_no like #{params.customerInquiryNo}