Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

 src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java

@@ -64,7 +64,7 @@
        return returnData(R.SUCCESS.getCode(), smsTemplateService.queryPage(dto, page));
    }

    @GetMapping("/template/list")
    @GetMapping("/aliyun/list")
    @ApiOperation(value = "短信模板列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<SmsTemplateDO>>> getALSmsTemplateList(Page page, SmsTemplateQueryDTO dto) throws Exception {
        Client client = createClient();