初始化提交
发布分支
Merge branch 'master' of https://code.jd.com/hy_0927/jiehunba.git
Merge remote-tracking branch 'ywd/master' into deploy
删除kendo，pom修改一个aop的包
添加活动和经销商实体类