Merge branch 'master' of shikejing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlCompanyCaseController.java

@@ -87,7 +87,8 @@ public class ZjxlCompanyCaseController extends BaseController {
            companyCase.setCompanyDefaultImg(companyDefaultImg);
            companyCase.setCompanyExchangeImg(companyExchangeImg);
            //http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&id=1&pageNo=1&pageSize=10&systemDictType=
            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
//            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
            companyCase.setCompanyJumpUrl(companyJumpUrl);
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);
@@ -175,7 +176,8 @@ public class ZjxlCompanyCaseController extends BaseController {
            companyCase.setCompanyDefaultImg(companyDefaultImg);
            companyCase.setCompanyExchangeImg(companyExchangeImg);
            //http://172.26.0.30:8080/zjxl/zjxlArticleContent/findArticleContentById?articleContentTitle=&id=1&pageNo=1&pageSize=10&systemDictType=
            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
//            companyCase.setCompanyJumpUrl(idUrl+"id="+companyJumpUrl+"");
            companyCase.setCompanyJumpUrl(companyJumpUrl);
            companyCase.setCompanySort(companySort);
            companyCase.setCompanyIsLine(companyIsLine);
            companyCase.setCompanyTestBannerId(companyTestBannerId);

guns-main/src/main/java/cn/stylefeng/guns/zjxl/service/ZjxlBasicInfoService.java

@@ -31,8 +31,9 @@ public class ZjxlBasicInfoService extends BaseService {
        return info.getBasicInfoId();
    }
    public ZjxlBasicInfo findBasicInfo(String basicInfoId){
    public Iterable<ZjxlBasicInfo> findBasicInfo(String basicInfoId){
        ZjxlBasicInfo info = basicInfoDao.findById(basicInfoId);
        return info;
        Iterable<ZjxlBasicInfo> infoIterable = basicInfoDao.findAll();
        return infoIterable;
    }
}