Merge remote-tracking branch 'origin/feature/0721-tenant' into ponline

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -508,7 +508,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                     String errLines = value.stream().map(String::valueOf).collect(Collectors.joining("、"));
                     lineErr.add("第" + errLines + "行");
                 }
-                err.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
+                err.append(String.join(",", lineErr)).append("错误，").append(code_repeat);
                 errData.add(err.toString());
             }
             return HttpResponseResult.failed(500, errData,errMsg.toString());