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

src/main/resources/mapper/SearchMapper.xml

@@ -30,7 +30,7 @@
         p.productCategory as p_type,
         p.validFlag as p_valid,
         IFNULL(p.visibility,3) as p_visibility,
-        p.price8Text as p_act_flag
+        IFNULL(p.price8Text,0) as p_act_flag
     </sql>
     <sql id="Product_Joins">
         left join tinytype as t on p.tinyTypeID = t.tinyTypeID
@@ -280,7 +280,7 @@
             p.price1 as price,
             p.shopID as shopId,
             p.searchKey as keyword,
-            p.price8Text as beautyActFlag
+            IFNULL(p.price8Text,0) as beautyActFlag
         from product p
         left join cm_brand as br on p.brandID = br.id
         where p.productCategory = 1