root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/onemall

Browse Source
This commit is contained in:
jwf1173 2020-05-12 14:34:02 +08:00
commit 6d86e349ef
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
promotion/pom.xml
View File

@ -12,9 +12,9 @@
<artifactId>promotion</artifactId> <artifactId>promotion</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>promotion-service-api</module> <!-- <module>promotion-service-api</module>-->
<module>promotion-service-impl</module> <!-- <module>promotion-service-impl</module>-->
<module>promotion-application</module> <!-- <module>promotion-application</module>-->
</modules> </modules>
<dependencyManagement> <dependencyManagement>

6
system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java
View File

@ -36,21 +36,21 @@ public class AdminsSmsSignController {
@PostMapping("add") @PostMapping("add")
@ApiOperation("签名-添加") @ApiOperation("签名-添加")
public CommonResult addSign(@RequestBody AddSignRequest addSignRequest) { public CommonResult<?> addSign(@RequestBody AddSignRequest addSignRequest) {
smsService.addSign(AdminsSmsConvert.INSTANCE.convert(addSignRequest)); smsService.addSign(AdminsSmsConvert.INSTANCE.convert(addSignRequest));
return CommonResult.success(null); return CommonResult.success(null);
} }
@PutMapping("update") @PutMapping("update")
@ApiOperation("签名-更新") @ApiOperation("签名-更新")
public CommonResult updateSign(@RequestBody UpdateSignRequest updateSignRequest) { public CommonResult<?> updateSign(@RequestBody UpdateSignRequest updateSignRequest) {
smsService.updateSign(AdminsSmsConvert.INSTANCE.convert(updateSignRequest)); smsService.updateSign(AdminsSmsConvert.INSTANCE.convert(updateSignRequest));
return CommonResult.success(null); return CommonResult.success(null);
} }
@DeleteMapping("deleted") @DeleteMapping("deleted")
@ApiOperation("签名-删除") @ApiOperation("签名-删除")
public CommonResult deletedSign(@RequestParam("id") Integer id) { public CommonResult<?> deletedSign(@RequestParam("id") Integer id) {
smsService.deleteSign(id); smsService.deleteSign(id);
return CommonResult.success(null); return CommonResult.success(null);
} }