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

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingOrderController.java

@@ -107,8 +107,8 @@ public class BillingOrderController {
     }
 
     @RequestMapping("/list-sms-package-record")
-    public RestResponse listSmsPackageRecord(String search, String startDate, String endDate, Integer smsPackageId, int pageNum, int pageSize) {
-        ServiceResponse<Page<BillingSmsRecordDTO>> resp = billingSmsRecordApiService.pageSmspackageRecord(search, startDate, endDate, smsPackageId, pageNum, pageSize);
+    public RestResponse listSmsPackageRecord(String search, String startDate, String endDate, Integer smsPackageId, int currentPage, int pageSize) {
+        ServiceResponse<Page<BillingSmsRecordDTO>> resp = billingSmsRecordApiService.pageSmspackageRecord(search, startDate, endDate, smsPackageId, currentPage, pageSize);
         return ResultControllerUtils.commonResult(resp);
     }