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

promotion/pom.xml

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

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

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