Merge remote-tracking branch 'origin/master' into feat-demand-0720

src/main/java/com/isoft/tenio/business/bnsproject/controller/BnsProjectController.java

@@ -2002,11 +2002,15 @@ public class BnsProjectController {
             int i = 0;
             for (BnsProduct product : bnsProductList) {
 
+                ProductQueryDto productQueryDto = new ProductQueryDto();
+
                 if(product.getProductType() != null){
                     BnsProperty bnsProperty = iBnsPropertyService.getById(product.getProductType());
                     if(bnsProperty != null){
                         if(bnsProperty.getName() != null){
 
+                            productQueryDto.setProjectTypeName(bnsProperty.getName());
+
 
                             if(i == 0){
                                 sBuffer.append(bnsProperty.getName());
@@ -2018,9 +2022,6 @@ public class BnsProjectController {
                 }
                 i = i + 1;
 
-
-                ProductQueryDto productQueryDto = new ProductQueryDto();
-
                 String productId = product.getBusinessId();
 
                 List<BnsFileImg> productImgList = new ArrayList<>();

src/main/java/com/isoft/tenio/business/bnsproject/dto/ProductQueryDto.java

@@ -15,6 +15,9 @@ public class ProductQueryDto {
 	// 楼盘名称
 	private String projectName;
 
+	// 产品类型名称
+	private String projectTypeName;
+
 	// 产品图片集合
 	private List<BnsFileImgDto> productImgList;