Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseSmsController.java

@@ -86,14 +86,14 @@ public class EnterpriseSmsController {
     }
 
     @RequestMapping("/get-sms")
-    public RestResponse getSms(Long signId) {
-        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(UserDetailUtils.getUserDetail().getEnterpriseId(), signId), EnterpriseSmsSignVO.class);
+    public RestResponse getSms(Long signId, Integer enterpriseId) {
+        return ResultControllerUtils.commonResultOne(smsOuterApiService.getSmsSignByid(enterpriseId, signId), EnterpriseSmsSignVO.class);
     }
 
     @RequestMapping("/edit-sms")
-    public RestResponse editSms(Long signId, String smsSignId, String smsSignText, int useType) {
+    public RestResponse editSms(Long signId, String smsSignId, String smsSignText, int useType, Integer enterpriseId) {
         return ResultControllerUtils
-                .commonResult(smsOuterApiService.editEnterpriseSmsSign(UserDetailUtils.getUserDetail().getEnterpriseId(), signId, smsSignId, smsSignText, useType));
+                .commonResult(smsOuterApiService.editEnterpriseSmsSign(enterpriseId, signId, smsSignId, smsSignText, useType));
     }
 
     @RequestMapping("/delete-sms")