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

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/notice/controller/BladeNoticeController.java

@@ -68,7 +68,6 @@ public class BladeNoticeController extends BladeController {
 			.eq(BladeNotice::getStatus, 1)
 			.eq(BladeNotice::getVisibleRoles, bladeNotice.getVisibleRoles())
 			.eq(ObjectUtils.isNotNull(bladeNotice.getBrandScope()), BladeNotice::getBrandScope, bladeNotice.getBrandScope())
-			.notLike(BladeNotice::getCustomerBlacklist, AuthUtil.getUserId())
 			.orderByDesc(BladeNotice::getCreateTime);
 		List<BladeNotice> list = bladeNoticeService.list(lambdaQueryWrapper);
 		return R.data(list);

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/corp/service/impl/ShopAppCorpsDescServiceImpl.java

@@ -316,7 +316,7 @@ public class ShopAppCorpsDescServiceImpl extends ServiceImpl<ShopAppCorpsDescMap
 				corpsDescVO.setCorpsTypeName(corpsName);
 			}
 		}
-		return R.data(corpsDesc);
+		return R.data(corpsDescVO);
 	}
 
 	@Override

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/insurance/service/impl/ShopAppTireInsuranceRegisterServiceImpl.java

@@ -426,7 +426,7 @@ public class ShopAppTireInsuranceRegisterServiceImpl extends ServiceImpl<ShopApp
 		claim.setClaimType("2");
 		claim.setSourceId(AuthUtil.getUserId());
 		claim.setSourceCode("");
-		claim.setSourceName(AuthUtil.getUserName());
+		claim.setSourceName("车主");
 		// 8. 保存理赔申请信息
 		bladeClaimService.save(claim);
 		ShopAppTireInsuranceRecord tireInsuranceRecord = new ShopAppTireInsuranceRecord();