Merge branch 'hotfix-0622-yuj' into dev

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductDao.java

@@ -78,7 +78,7 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @return
      */
     @Query(nativeQuery = true, value = "select p.* from products p left join product$private pp on pp.pr_id = p.pr_id where " +
-            "p.pr_enuu=:enUU and p.pr_pcmpcode = :pcmpcode and p.pr_pbranden = :pbranden and pp.pr_b2cenabled = :b2cEnabled")
+            "p.pr_enuu=:enUU and p.pr_pcmpcode = :pcmpcode and (p.pr_pbranden = :pbranden or p.pr_pbrand = :pbranden) and pp.pr_b2cenabled = :b2cEnabled")
     List<Product> findByEnUUAndPcmpcodeAndPbrandenAndB2cEnabled(@Param("enUU")Long enUU, @Param("pcmpcode")String pcmpcode, @Param("pbranden")String pbranden, @Param("b2cEnabled")Integer b2cEnabled);
 
     /**