Merge remote-tracking branch 'origin/developer' into developerA

# Conflicts:
#	src/main/java/com/caimei365/tools/service/impl/ProductServiceImpl.java

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -203,11 +203,14 @@
         (
         CASE WHEN b.userID = 0 THEN ''
         WHEN u.userIdentity = 2 THEN c.name
+        when u.userIdentity = 3 then s.name
         WHEN u.userIdentity = 4 THEN IF(c.name != u.userName,c.name,'')
         END)AS corporateName,
         (
         CASE WHEN b.userID = 0 THEN ''
-        WHEN b.userID != 0 THEN u.userName
+         WHEN u.userIdentity = 2 THEN c.linkMan
+         WHEN u.userIdentity = 3 THEN s.linkMan
+         WHEN u.userIdentity = 4 THEN c.linkMan
         END)AS contacts,
         (CASE WHEN u.userIdentity = 2 THEN c.contractMobile
         WHEN u.userIdentity = 4 THEN c.contractMobile