Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/contracts/product.ftl

@@ -109,7 +109,7 @@
                 </div>
                 <#if studentInfo.grade?default("")?trim?length gt 1>
                 <div class="iInfo">
-                    <span>所在学校与班级：${studentInfo.grade!} ${studentInfo.clazz!}</span>
+                    <span>所在班级：${studentInfo.grade!} ${studentInfo.clazz!}</span>
                 </div>
                 </#if>
                 <#if studentInfo.subject.name?default("")?trim?length gt 1>

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

@@ -114,6 +114,9 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(mg.organ_id_,#{organId})
             </if>
+            <if test="search != null and search != ''">
+                AND (mgq.user_id_ = #{search} OR mgq.music_group_id_ = #{search})
+            </if>
         </where>
     </sql>