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.javapull/7/head
commit
6eb46f53ae
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue