From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractRentTypeServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractRentTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractRentTypeServiceImpl.java
new file mode 100644
index 0000000..a9d5f7d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractRentTypeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.mapper.TContractRentTypeMapper;
+import com.ruoyi.system.model.TContractRentType;
+import com.ruoyi.system.service.TContractRentTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 租金递增递减方式 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Service
+public class TContractRentTypeServiceImpl extends ServiceImpl<TContractRentTypeMapper, TContractRentType> implements TContractRentTypeService {
+
+}

--
Gitblit v1.7.1