Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts: # src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java # src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java # src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java # src/main/java/com/ai/da/mapper/primary/entity/Product.java # src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java # src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
This commit is contained in:
@@ -7,6 +7,7 @@ import com.ai.da.model.dto.GenerateThroughImageTextDTO;
|
||||
import com.ai.da.model.vo.GenerateCaptionVO;
|
||||
import com.ai.da.model.vo.GenerateCollectionVO;
|
||||
import com.ai.da.model.vo.GenerateLikeVO;
|
||||
import com.ai.da.model.vo.PrepareForGenerateVO;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
@@ -27,7 +28,7 @@ public interface GenerateService extends IService<Generate> {
|
||||
|
||||
GenerateCollectionVO getGenerateResult(String uniqueId);
|
||||
|
||||
String prepareForGenerate(GenerateThroughImageTextDTO generateThroughImageTextDTO);
|
||||
PrepareForGenerateVO prepareForGenerate(GenerateThroughImageTextDTO generateThroughImageTextDTO);
|
||||
|
||||
Long getRankPosition(String uniqueId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user