Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/admin/src/main/java/com/fire/admin/service/impl/CustomerProductInfoServiceImpl.java

common/fire-dto/src/main/java/com/fire/dto/CustomerProduct.java

@@ -56,6 +56,10 @@ public class CustomerProduct {
 
     /********************扩展冗余字段*********************/
 
+    @ApiModelProperty(value = "产品id")
+    @TableField(exist = false)
+    private Integer productId;
+
     @ApiModelProperty(value = "适用区域（省份名称）")
     @TableField(exist = false)
     private  String areaName;

modules/make-order/src/main/java/com/fire/order/service/impl/MakeOrderServiceImpl.java

@@ -327,7 +327,7 @@ public class MakeOrderServiceImpl implements MakeOrderService {
         order.setFlowAmount(product.getFacePrice());
         order.setAreaCode(product.getAreaNum());
         order.setPrice(product.getPrice());
-//        order.setProductId(product.getProductId());
+        order.setProductId(product.getProductId());
         order.setCustomerProductId(product.getCustomerProductId());
         order.setPhoneOperator(product.getOperator());
         order.setPhoneCity(phoneZone.getAreaCode());