Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/RechargeRecordQO.java

@@ -23,6 +23,11 @@ public class RechargeRecordQO extends PageQO {
 
     private Integer auditStatus;
 
+    /**
+     * 流水号
+     */
+    private String serialNumber;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -62,4 +67,13 @@ public class RechargeRecordQO extends PageQO {
     public void setAuditStatus(Integer auditStatus) {
         this.auditStatus = auditStatus;
     }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public RechargeRecordQO setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+        return this;
+    }
 }

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRechargeRecordMapper.xml

@@ -244,6 +244,9 @@
       <if test="auditStatus == null">
         and audit_status &lt;&gt; 0
       </if>
+      <if test="serialNumber != null and serialNumber != '' ">
+        and serial_number like concat('%', #{serialNumber}, '%')
+      </if>
     order by create_time desc
   </select>
   <update id="updateBySerialNumber">