Browse Source

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

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

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

@@ -52,7 +52,7 @@
     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,
@@ -112,7 +112,7 @@
   		or ui.username = #{username,jdbcType=VARCHAR})
   	</if>
   </select>
-  
+   
   
   <select id="findOrgAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.OrgAchievementOrderListBo">
   	select 
@@ -173,4 +173,5 @@
   		or ui.username = #{unitName,jdbcType=VARCHAR})
   	</if>
   </select>
+  -->
 </mapper>