From c35134a007a610bc26948f1eaf1340fbe9d0aeb9 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Tue, 9 Apr 2024 08:41:19 +0800
Subject: [PATCH] FIRSTCOMMIT

---
 pom.xml                                          |  10 +++++-----
 .../src/main/resources/application-druid.yml     |   4 ++--
 ruoyi-admin/src/main/resources/static/ruoyi.png  | Bin 5645 -> 0 bytes
 .../templates/system/indenture/edit.html         |   2 +-
 .../templates/system/indenture/indenture.html    |   6 +++---
 .../mapper/system/TdIndentureMapper.xml          |   2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/resources/static/ruoyi.png

diff --git a/pom.xml b/pom.xml
index ba0ad47..01f4014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,11 +184,11 @@
             </dependency>
 
             <!-- mybatisplus-->
-<!--            <dependency>-->
-<!--                <groupId>com.baomidou</groupId>-->
-<!--                <artifactId>mybatis-plus-boot-starter</artifactId>-->
-<!--                <version>3.5.4</version>-->
-<!--            </dependency>-->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>3.5.2</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 037db5c..c8d784b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: qwer1234
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi.png b/ruoyi-admin/src/main/resources/static/ruoyi.png
deleted file mode 100644
index b0af01fefabd113d23cde619dda7a429653e99c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5645
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

diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
index 4a4360c..1071225 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
@@ -61,7 +61,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
-                    <textarea name="REMARK" class="form-control">[[*{remark}]]</textarea>
+                    <textarea name="remark" class="form-control">[[*{remark}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html b/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
index 93ad204..10f395c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
@@ -11,15 +11,15 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>维修商名称：</label>
+                                <label>名称：</label>
                                 <input type="text" name="indentureName"/>
                             </li>
                             <li>
-                                <label>维修商地址：</label>
+                                <label>地址：</label>
                                 <input type="text" name="indentureAddress"/>
                             </li>
                             <li>
-                                <label>维修商状态：</label>
+                                <label>状态：</label>
                                 <select name="indentureState" th:with="type=${@dict.getType('sys_normal_disable')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
index 9d0afb7..05df751 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdIndentureMapper.xml
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="linkmanPhone != null">LINKMAN_PHONE = #{linkmanPhone},</if>
             <if test="linkmanMobile != null">LINKMAN_MOBILE = #{linkmanMobile},</if>
             <if test="indentureState != null">INDENTURE_STATE = #{indentureState},</if>
-            <if test="REMARK != null">REMARK = #{remark},</if>
+            <if test="remark != null">REMARK = #{remark},</if>
             <if test="createStaffid != null">CREATE_STAFFID = #{createStaffid},</if>
             <if test="createDate != null">CREATE_DATE = #{createDate},</if>
         </trim>