Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -404,7 +404,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        else if("2".equals(type)){
            //下线
            activityDO.setStatus(2);
        }else if("1".equals(type)){
        }else if("0".equals(type)){
            //上线
            String ruleJson=null!=activityRuleDO?activityRuleDO.getValue2():"";
            JSONObject obj=JSONObject.parseObject(ruleJson);