Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -111,10 +111,12 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 	public boolean saveOrUpdateBasicdataStoreContact(BasicdataStoreContactEntity basicdataStoreContact) {
 		//进行客户列表的联系人修改
 		Long shopId = basicdataStoreContact.getShopId();
+		if (basicdataStoreContact.getDefaultType()){
 			BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity();
 			basicdataClientEntity.setId(shopId);
 			basicdataClientEntity.setLinkman(basicdataStoreContact.getLinkman());
 			basicdataClientEntity.setPhone(basicdataStoreContact.getPhone());
+		}
 		return this.saveOrUpdate(basicdataStoreContact);
 	}