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

# Conflicts:
#	src/main/java/com/caimei/modules/product/service/ProductService.java

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -234,9 +234,9 @@ public class Product extends DataEntity<Product> {
      * 新品商品状态  1.已审核  2.未参与   3.审核未通过
      */
     private Integer newvalidFlag;
-/**
- * 新品展示状态
- */
+    /**
+     * 新品展示状态
+     */
     private Integer showFlag;
     /**
      * 展示结束时间