Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 2cb8d69254e70e45d8957f60a9055f80487e17b1

Merge remote-tracking branch 'origin/master'

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -923,7 +923,12 @@
                    Boolean wxCodeSuccess = false;
                    if (active.equals("hzszlyy")) {
                        if (!map.isEmpty() && map.get("success") != null) {
                            wxCodeSuccess = (boolean) map.get("success");
                            Integer wxCodeSuccessShiyi = (Integer) map.get("success");
                            if(ObjectUtils.isNotEmpty(wxCodeSuccessShiyi) && wxCodeSuccessShiyi == 1){
                                wxCodeSuccess = true;
                            }else {
                                wxCodeSuccess = false;
                            }
                        }
                    } else {
                        if (!map.isEmpty() && map.get("succ") != null) {