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

huanghongfa

2021-08-15 4ca86cb13b25ece24a323300294b0507926b37a2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java

@@ -206,7 +206,7 @@
                    ComActDiscussDO discussDO = comActDiscussDAO.selectById(serviceId);
                    if(discussDO != null){
                        remark.append("【");
                        remark.append(discussDO.getVoteTitle());
                        remark.append(discussDO.getDiscussSubject());
                        remark.append("】");
                    }
                }else{