Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

 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{