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

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -339,7 +339,9 @@
 			priceFlag,
 			beautyActFlag,
 			ladderPriceFlag,
+		    <if test="stock !=''">
 			stock,
+			</if>
 			hasSkuFlag,
 			mainImage,
 			propertiesInfo,
@@ -413,7 +415,9 @@
 					 #{priceFlag},
 					 #{beautyActFlag},
 					 #{ladderPriceFlag},
+					 <if test="stock !=''">
 					 #{stock},
+					 </if>
 					 #{hasSkuFlag},
 					 #{mainImage},
 					 #{propertiesInfo},