Merge remote-tracking branch 'origin/master'

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -377,10 +377,10 @@ public class MsgAlarmController extends BaseController {
         msgAlarm.setUpdateBy(getUserId());
         msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedReason())) {
+        if (!ObjectUtils.isEmpty(releasedReason)) {
             msgAlarm.setReleasedReason(releasedReason);
         }
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+        if (!ObjectUtils.isEmpty(releasedType)) {
             msgAlarm.setReleasedType(releasedType);
         }
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));