Merge remote-tracking branch 'ruoyi-cloud/master' into dev

# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -85,4 +85,12 @@ public class R<T> implements Serializable {
         return r;
     }
 
+    public Boolean isError() {
+        return !isSuccess();
+    }
+
+    public Boolean isSuccess() {
+        return R.SUCCESS == getCode();
+    }
+
 }