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

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

@@ -145,4 +145,15 @@ public class ZjxlPartnerController extends BaseController {
        }
    }
    @RequestMapping(value = "/findPartenrAll", method = RequestMethod.GET)
    @ApiOperation("查询所有已经上线的合作伙伴")
    public String findPartenrAll(){
        try {
            return write(200,"查询成功", "data", partnerService.findPartenrAll());
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败");
        }
    }
}

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

@@ -42,6 +42,12 @@ public class ZjxlPartnerService extends BaseService {
        return partnerList;
    }
    public List<ZjxlPartner> findPartenrAll(){
        String sql = "select * from zjxl_partner where partner_is_line = 1 order by concat(partner_sort,partner_create_time) desc";
        List<ZjxlPartner> partnerList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZjxlPartner.class));
        return partnerList;
    }
    public int allCount(){
        String sql = "select count(*) from zjxl_partner ";
        Integer allCount = jdbcTemplate.queryForObject(sql, Integer.class);;