Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

 server/dmmall_service/src/main/resources/templates/controller.vm

@@ -22,7 +22,7 @@
 * @author doumee
 * @date ${nowDate}
 */
@Api(tags = "tableName接口")
@Api(tags = "${tableName}接口")
@RestController
@RequestMapping("/business/${entityNameLower}")
public class ${entityName}Controller extends BaseController {