Merge branch 'test' into 'master'

罗元桥

2021-08-11 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767

 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{