Merge remote-tracking branch 'origin/dev.gateway' into dev.gateway

# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java
#	cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java
pull/7/head
Li HD 2024-09-29 10:51:11 +08:00
commit 6eb46f53ae
1 changed files with 1 additions and 0 deletions

View File

@ -3,6 +3,7 @@ package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.domain.req.MessageTemplateAddReq;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.domain.req.MessageTemplateAddReq;
import io.swagger.v3.oas.annotations.media.Schema;