Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -164,7 +164,7 @@
                 <![CDATA[AND iip.plan_start_ <= #{endTime}]]>
             </if>
             <if test="search != null">
-                AND mg.name LIKE CONCAT('%', #{search}, '%')
+                AND mg.name_ LIKE CONCAT('%', #{search}, '%')
             </if>
         </where>
     </sql>