Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -16,6 +16,7 @@ import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +87,8 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
     @Override
     public String getCurrency() {
         logger.log("物料详情", "获取币别，企业：" + SystemSession.getUser().getEnterprise().getEnName());
-        return enterpriseService.getCurrencyByRegisterAddress().getData().toString();
+        Object result = enterpriseService.getCurrencyByRegisterAddress().getData();
+        return result == null ? "" : result.toString();
     }
 
     @Override