Merge remote-tracking branch 'origin/saas' into saas

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

@@ -35,7 +35,7 @@
                 AND menu_id_ = #{menuId}
             </if>
             <if test="search != null and search != '' ">
-                AND (name_ like concat('%', #{search} '%') )
+                AND (sm.name_ like concat('%', #{search} '%') )
             </if>
         </where>
         <include refid="global.limit"/>
@@ -54,7 +54,7 @@
                 AND sm.menu_id_ = #{menuId}
             </if>
             <if test="search != null and search != '' ">
-                AND (name_ like concat('%', #{search} '%') )
+                AND (sm.name_ like concat('%', #{search} '%') )
             </if>
         </where>
         <include refid="global.limit"/>