Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-28 098b507166a2b23f0256d5c4f097e7f05f11e9be

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java

@@ -48,8 +48,8 @@
        }
        Integer type = comActDiscussDTO.getType();
        String voteTitle = comActDiscussDTO.getVoteTitle();
        List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.intValue()==2 ) {
        List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.equals(2)) {
            if(ObjectUtils.isEmpty(voteTitle)){
                return R.fail("投票标题不能为空");
            }