Browse Source

Accept Merge Request #234 合并到生产 : (master -> prod)

Merge Request: 合并到生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/234
浅川 8 years ago
parent
commit
9582ec714b

+ 1 - 3
src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml

@@ -43,8 +43,7 @@
   		and ao.status = #{status,jdbcType=INTEGER}
   	</if>
   </select>
-  -->
-  
+   
   <select id="selectAchievementOrderByAchievementId" parameterType="java.lang.String" resultMap="BaseResultMap">
   	 select 
     <include refid="Base_Column_List" />
@@ -52,7 +51,6 @@
     where achievement_id = #{achievementId,jdbcType=VARCHAR}
   </select>
   
-  <!-- 
    <select id="findUserAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.UserAchievementOrderListBo">
   	select 
   		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,