Merge pull request 'develop' (#274) from develop into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/274
This commit is contained in:
commit
4544ab036d
@ -119,7 +119,7 @@
|
|||||||
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
|
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
|
||||||
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
|
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
|
||||||
</where>
|
</where>
|
||||||
order by create_time desc
|
order by bill_month desc ,emp_name desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="checkUnique" parameterType="EmisCommissionProfit" resultType="int">
|
<select id="checkUnique" parameterType="EmisCommissionProfit" resultType="int">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user