Merge remote-tracking branch 'origin/master'

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

@@ -347,7 +347,7 @@
                 </if>
             </if>
             <if test="noneTqType != null">
-                and spro.mer_no_ != '淘气微信'
+                and spro.mer_no_ != '淘器微信'
             </if>
         </where>
 		order by spro.id_ desc
@@ -378,7 +378,7 @@
         		</if>
         	</if>
             <if test="noneTqType != null">
-                and spro.mer_no_ != '淘气微信'
+                and spro.mer_no_ != '淘器微信'
             </if>
         </where>
 		order by spro.id_ desc