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

# Conflicts:
#	src/main/java/com/caimei/modules/product/web/ProductNewController.java

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -250,7 +250,6 @@ public class ProductNewController extends BaseController {
         model.addAttribute("searchBigTypeID", product.getBigTypeID());
         model.addAttribute("searchSmallTypeID", product.getSmallTypeID());
         model.addAttribute("searchTinyTypeID", product.getTinyTypeID());
-        model.addAttribute("searchValidFlag", product.getValidFlag());
         model.addAttribute("searchActStatus", product.getActStatus());
         model.addAttribute("searchProductType", product.getProductType());
         model.addAttribute("searchBrandID", product.getBrandID());