Merge remote-tracking branch 'origin/master'

doum

昨天 a76e2318dd2731ff713df6e262396a9175d029f7

 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 {