1.pc公告问题修改

2.门店个人信息分类显示问题修改
3.轮胎保生成保单来源方明称问题

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-dealer-admin/src/main/java/com/gubersail/admin/order/mapper/OrderMapper.xml

@@ -92,7 +92,7 @@
         ps.storage_id as stockId,
         ps.ord_no AS billno,
         ps.status AS statusName,
-        ps.create_time AS updateTime,
+        ps.busines_date AS updateTime,
         pgd.brand_item AS brandItem,
         pgd.cname AS goodsName,
         pgd.specification_and_model AS specificationAndModel,
@@ -122,7 +122,6 @@
         </if>
         GROUP BY
         ps.ord_no
-        ORDER BY ps.busines_date asc
     </select>
     <select id="selectGoodsNumBySrcOrderNo" resultType="java.math.BigDecimal">
         SELECT

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/ship/mapper/ShipMapper.xml

@@ -46,7 +46,7 @@
         ps.billno AS billno,
         ANY_VALUE(ps.customer_name) AS corpName,
         ANY_VALUE(ps.status_name) AS statusName,
-        ANY_VALUE(ps.create_time) AS updateTime,
+        ANY_VALUE(ps.busines_date) AS updateTime,
         ANY_VALUE(pgd.brand_item) AS brandItem,
         ANY_VALUE(pgd.cname) AS goodsName,
         ANY_VALUE(pgd.specification_and_model) AS specificationAndModel,
@@ -142,7 +142,6 @@
         </if>
         GROUP BY
         ps.billno
-        ORDER BY ps.busines_date asc
     </select>
 
 </mapper>

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

@@ -417,7 +417,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();