修改service.ftl中已经被废弃的变量名
Merge remote-tracking branch 'origin/jeesite_plus' into jeesite_shop
add brand crud