Merge branch 'master' into branch

src/main/java/com/gogirl/domain/product/mall/MallProduct.java

@@ -73,7 +73,9 @@ public class MallProduct {
     private BigDecimal bargainPrice;
     @ApiModelProperty("是否开启特价 1-是 2否")
     private Integer isBargainPrice;
+
     private String serialCategoryName;
+
     private String modelName;
     @TableField(exist = false)
     private List<MallCategory> mallCategoryList;

src/main/resources/mapper/product/BaseFeaturesMapper.xml

@@ -6,7 +6,7 @@
     <select id="queryServeFeatures" resultType="com.gogirl.domain.product.serve.BaseFeatures">
         select t1.* from base_features t1
         INNER JOIN features_mapping t2 on t1.id = t2.features_id
-        left join base_serve bs on t2.data_id = bs.id
+        left join base_serve bs on t2.data_id = bs.id and bs.`status` =1
         where t2.data_type = 1
         <if test="serveTypeId != null">
             and bs.type_id=#{serveTypeId}

src/main/resources/mapper/product/BaseProduceMapper.xml

@@ -99,6 +99,7 @@
         <if test="colorSystemId !=null ">
             and t3.color_system_id =#{colorSystemId}
         </if>
+        and t1.`status` =1
         <choose>
             <when test="sort == 1 ">
                 order by t1.sales_num desc