Merge remote-tracking branch 'origin-gitlab/qa' into qa-gitlab

src/main/java/com/link/bi/domain/orderdomain/dao/OrdersSentDaoImpl.java

@@ -50,6 +50,7 @@ public class OrdersSentDaoImpl implements IOrdersSentDao{
 
     private LambdaQueryWrapper<OrdersSent> builderWq(OrdersSentWq ordersSentWq) {
         LambdaQueryWrapper<OrdersSent> qw = new LambdaQueryWrapper<>();
+        ordersSentWq.reSentNo();
         if (StringUtils.isNotBlank(ordersSentWq.getAhSentNo())){
             qw.eq(OrdersSent::getAhSentNo, ordersSentWq.getAhSentNo());
         }

src/main/java/com/link/bi/domain/orderdomain/entity/OrdersSent.java

@@ -46,7 +46,7 @@ public class OrdersSent implements Serializable {
     /**
      * 过账日期
      */
-    private Date postData;
+    private Date postDate;
 
     /**
      * 状态

src/main/java/com/link/bi/domain/orderdomain/wq/OrdersSentWq.java

@@ -47,7 +47,7 @@ public class OrdersSentWq {
      */
     private Boolean isOperateEnd;
 
-    public void setSentNo(String sentNo) {
+    public void reSentNo() {
         if (sentNo == null) {
             return;
         }

src/main/resources/mapper/order/OrdersSentMapper.xml

@@ -10,7 +10,7 @@
             <result property="bjSentNo" column="bj_sent_no" jdbcType="VARCHAR"/>
             <result property="bjSentVersion" column="bj_sent_version" jdbcType="INTEGER"/>
             <result property="type" column="type" jdbcType="CHAR"/>
-            <result property="postData" column="post_data" jdbcType="DATE"/>
+            <result property="postDate" column="post_date" jdbcType="DATE"/>
             <result property="status" column="status" jdbcType="CHAR"/>
             <result property="transport" column="transport" jdbcType="VARCHAR"/>
             <result property="transportName" column="transport_name" jdbcType="VARCHAR"/>
@@ -18,7 +18,7 @@
             <result property="expressNo" column="express_no" jdbcType="VARCHAR"/>
             <result property="ddNo" column="dd_no" jdbcType="VARCHAR"/>
             <result property="pushQc" column="push_qc" jdbcType="INTEGER"/>
-            <result property="operateEndDatetime" column="operate_end_dateTime" jdbcType="TIMESTAMP"/>
+            <result property="operateEndDatetime" column="operate_end_datetime" jdbcType="TIMESTAMP"/>
             <result property="sentStatus" column="sent_status" jdbcType="VARCHAR"/>
             <result property="receiptFlag" column="receipt_flag" jdbcType="VARCHAR"/>
             <result property="receiptPhoto" column="receipt_photo" jdbcType="VARCHAR"/>