best_yunwei
/
ai_images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: best_yunwei:1bedde7fa7f73679e5cb7e4d624f8203c67e24cf
Branches Tags
best_yunwei:master
best_yunwei:nanobanana
best_yunwei:seedance_balance
best_yunwei:proxy
best_yunwei:new-style
best_yunwei:seedance
best_yunwei:dingzhi
best_yunwei:seedance_score
..
compare: best_yunwei:fedaef2ff7b15be381af0169084c659dbb598838
Branches Tags
best_yunwei:master
best_yunwei:nanobanana
best_yunwei:seedance_balance
best_yunwei:proxy
best_yunwei:new-style
best_yunwei:seedance
best_yunwei:dingzhi
best_yunwei:seedance_score

No commits in common. "1bedde7fa7f73679e5cb7e4d624f8203c67e24cf" and "fedaef2ff7b15be381af0169084c659dbb598838" have entirely different histories.
1bedde7fa7 ... fedaef2ff7

2 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

5
web-api/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@ -30,8 +30,5 @@ email.verification.code.error=Verification code is incorrect, please try again.
# User not found # User not found
user.not.found=User not found. user.not.found=User not found.
user.password.incorrect=Password is incorrect, please try again. user.password.incorrect=Password is incorrect, please try again.
# video generation
order.number.generation.failed=Order number {0} generation failed, please try again later. order.number.generation.failed=Order number {0} generation failed, please try again later.
order.number.generation.submit=Order number {0} generation task submitted! order.number.generation.successes=Order number {0} generation successes!
order.number.generation.successbackfill=Order number {0} sucessed! Amount is back filled!

2
web-api/ruoyi-system/src/main/resources/mapper/system/AiOrderMapper.xml
View File

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAiOrderList" parameterType="AiOrder" resultMap="AiOrderResult"> <select id="selectAiOrderList" parameterType="AiOrder" resultMap="AiOrderResult">
<include refid="selectAiOrderVo"/> <include refid="selectAiOrderVo"/>
<where> <where>
<if test="orderNum != null and orderNum != ''"> and ao.order_num like concat('%', #{orderNum}, '%')</if> <if test="orderNum != null and orderNum != ''"> and ao.orderNum like concat('%', #{orderNum}, '%')</if>
<if test="text != null and text != ''"> and ao.text like concat('%', #{text}, '%')</if> <if test="text != null and text != ''"> and ao.text like concat('%', #{text}, '%')</if>
<if test="userId != null "> and ao.user_id = #{userId}</if> <if test="userId != null "> and ao.user_id = #{userId}</if>
<if test="uuid != null "> and au.user_id = #{uuid}</if> <if test="uuid != null "> and au.user_id = #{uuid}</if>