Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-23 b0ccb0c3aed69745cfe44f8b0707becf56b56f6e

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

@@ -331,7 +331,7 @@
                        }
                        else {
                            identityType=1;
                            remark.append("取消党员活动扣除积分");
                            remark.append("取消居民活动扣除积分");
                        }

                }