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

src/main/resources/mapper/ProductMapper.xml

@@ -39,7 +39,7 @@
 			b.name as bigTypeText,
 
 			p.shopID as shopId,
-			sh.name as shopTitle,
+			if(p.realShopName is null or p.realShopName = '',sh.name,p.realShopName) as shopTitle,
 			sh.businessScope as businessScope,
 			sh.authorizationCertificateImage as license,
 			CONCAT(pr.name, ci.name) as shopAddress