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

# Conflicts:
#	08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/constant/Constants.java

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdAttrPriceController.java

@@ -1,6 +1,7 @@
 package com.xingxi.web.controller.master.product.controller;
 
 import com.xingxi.common.annotation.Log;
+import com.xingxi.common.constant.Constants;
 import com.xingxi.common.core.controller.BaseController;
 import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.enums.BusinessType;
@@ -55,7 +56,7 @@ public class ProdAttrPriceController extends BaseController {
         prodAttrPriceVo.setSellerName(merchant.getMercName());
         prodAttrPriceVo.setSellerRoleKey(ERoleKey.MERCHANT.getCode());
         prodAttrPriceVo.setSellerRoleName(ERoleKey.MERCHANT.getDesc());
-        prodAttrPriceVo.setBuyerId(100L);
+        prodAttrPriceVo.setBuyerId(Constants.CUSTOMER_ID);
         prodAttrPriceVo.setBuyerName(ERoleKey.CUSTOMER.getDesc());
         prodAttrPriceVo.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
         prodAttrPriceVo.setBuyerRoleName(ERoleKey.CUSTOMER.getDesc());

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/constant/Constants.java

@@ -122,5 +122,6 @@ public class Constants
 
     /** 平台ID */
     public static final Long PLATFORM_ID = 100L;
-
+    /** 普通用户ID */
+    public static final Long CUSTOMER_ID = 0L;
 }