merge冲突修改

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -377,7 +377,6 @@ public class InquiryServiceImpl implements InquiryService {
             product.setCreateTime(new Date());
             product.setSourceApp(sourceApp);
             product.setSpec(StringUtils.isEmpty(item.getSpec()) ? item.getCmpCode() : item.getSpec());
-            product.setTitle(item.getProdTitle());
             products.add(product);
         }
         // 调用公共物料服务的接口

src/main/resources/config/application-txcloud.properties

@@ -30,6 +30,9 @@ ps.product.url=http://172.21.0.47:8080/
 ps.message.url=http://api-message.ubtob.com/
 mall.url = http://172.21.0.100
 
+# sso
+sso.url=https://sso.ubtob.com/
+
 #message
 message.senderuu=1000010022
 message.senderEnuu=10042875