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

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java

@@ -156,7 +156,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
     public BmCompanyInfo getCompanyInfoByUserId(Long userId) {
 
         BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.getCompanyInfoByUserId(userId);
-        return null;
+        return bmCompanyInfo;
     }