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

tangxiaobao

2022-04-24 dd9e637f8840fc9a7aee46acd7751994e0a05055

 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("取消居民活动扣除积分");
                        }

                }