Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingSmsRecordDTO.java

@@ -9,7 +9,7 @@ public class BillingSmsRecordDTO {
     /**
      * 
      */
-    private Integer smsRecordId;
+    private Long smsRecordId;
 
     /**
      * 
@@ -111,11 +111,11 @@ public class BillingSmsRecordDTO {
      */
     private String storeGroupName;
 
-    public Integer getSmsRecordId() {
+    public Long getSmsRecordId() {
         return smsRecordId;
     }
 
-    public void setSmsRecordId(Integer smsRecordId) {
+    public void setSmsRecordId(Long smsRecordId) {
         this.smsRecordId = smsRecordId;
     }
 

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

@@ -296,7 +296,7 @@
       and product_name like concat('%', #{productName}, '%')
     </if>
     </where>
-    order by create_time desc
+    order by deduction_time desc
   </select>
   <select id="countAccountBalanceRecord" resultType="int">
     select

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

@@ -482,7 +482,7 @@
           and sms_type = #{smsType}
       </if>
     </where>
-    order by create_time desc
+    order by deduction_time desc
   </select>
   <select id="countInternationalSmsRecord" resultType="int">
     select

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

@@ -301,7 +301,7 @@
         and product_name like concat('%', #{productName}, '%' )
       </if>
     </where>
-      order by create_time desc
+      order by deduction_time desc
   </select>
   <select id="countSmsPackageRecord" resultType="int">
     select

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

@@ -492,7 +492,7 @@
           and sms_type = #{smsType}
       </if>
     </where>
-    order by create_time desc
+    order by deduction_time desc
   </select>
   <select id="countSmsRecord" resultType="int">
     select