FIRSTCOMMIT

pom.xml

@@ -184,11 +184,11 @@
             </dependency>
 
             <!-- mybatisplus-->
-<!--            <dependency>-->
+            <dependency>
-<!--                <groupId>com.baomidou</groupId>-->
+                <groupId>com.baomidou</groupId>
-<!--                <artifactId>mybatis-plus-boot-starter</artifactId>-->
+                <artifactId>mybatis-plus-boot-starter</artifactId>
-<!--                <version>3.5.4</version>-->
+                <version>3.5.2</version>
-<!--            </dependency>-->
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

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:
                 # 从数据源开关/默认关闭

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">    

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>

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>