fix

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -488,11 +488,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND cgu.official_status = 1
         </if>
         <if test="officialStatus != null and officialStatus == 0 ">
-<<<<<<< HEAD
-            AND cgu.official_status != 1
-=======
             AND (cgu.official_status is NULL or cgu.official_status=0)
->>>>>>> master
         </if>
         <if test="realname != null and realname != ''">
             AND u.realname like concat('%', #{realname}, '%')

zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -158,42 +158,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderGoodsList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultMap="OrderHandleGoodsVoResult">
         SELECT
-<<<<<<< HEAD
-            u.realname,
-            u.id_card,
-            u.telphone,
-            g.goods_name,
-            g.`year`,
-            (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names,
-            og.goods_real_price,
-            og.order_goods_id,
-            o.user_id,
-            og.grade_id,
-            <if test="handleOrderSn != null">
-                oh.pay_status,
-            </if>
-            og.goods_id
-
-        FROM
-         `order` o
-        <if test="handleOrderSn != null">
-            LEFT JOIN order_handle oh ON o.handle_order_sn = oh.handle_order_sn
-        </if>
-                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
-                LEFT JOIN `user` u ON o.user_id = u.user_id
-                LEFT JOIN goods g ON og.goods_id = g.goods_id
-        WHERE
-            1=1
-            <if test="handleOrderSn != null">
-                AND o.handle_order_sn = #{handleOrderSn}
-            </if>
-            <if test="inputOrderSn != null">
-                AND o.input_order_sn = #{inputOrderSn}
-            </if>
-            <if test="refundStatus != null">
-                AND og.refund_status = #{refundStatus}
-            </if>
-=======
         u.realname,
         u.id_card,
         u.telphone,
@@ -208,7 +172,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oh.pay_status,
         </if>
         og.goods_id
-
         FROM
         `order` o
         <if test="handleOrderSn != null">
@@ -228,7 +191,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="refundStatus != null">
             AND og.refund_status = #{refundStatus}
         </if>
->>>>>>> master
     </select>
 
     <select id="selectOverTimeOrderList" parameterType="com.zhongzheng.modules.order.bo.OrderHandleQueryBo" resultType="com.zhongzheng.modules.order.vo.OrderHandleOverVo">