shiyang / regional-platform

Download as
Browse Code ยป

Commit 48b2d6ea84f661360e981c40fcc770b563bb273e

Authored by hanshaofeng
2 parents 5c755f054d bf1172a7d0
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml View file @ 48b2d6e
... ... @@ -254,7 +254,6 @@
254 254 </if>
255 255 <if test="yn != null">
256 256 and u.yn = #{yn,jdbcType=INTEGER}
257   - and ur.yn = #{yn,jdbcType=INTEGER}
258 257 </if>
259 258 <if test="type != null">
260 259 and u.type = #{type,jdbcType=INTEGER}
... ... @@ -291,7 +290,6 @@
291 290 </if>
292 291 <if test="yn != null and yn != ''">
293 292 and u.yn = #{yn,jdbcType=INTEGER}
294   - and ur.yn = #{yn,jdbcType=INTEGER}
295 293 </if>
296 294 <if test="type != null ">
297 295 and u.type = #{type,jdbcType=INTEGER}
platform-biz-service/src/main/resources/mainOrm/slave/Users.xml View file @ 48b2d6e
... ... @@ -251,7 +251,6 @@
251 251 </if>
252 252 <if test="yn != null">
253 253 and u.yn = #{yn,jdbcType=INTEGER}
254   - and ur.yn = #{yn,jdbcType=INTEGER}
255 254 </if>
256 255 <if test="type != null">
257 256 and u.type = #{type,jdbcType=INTEGER}
... ... @@ -288,7 +287,6 @@
288 287 </if>
289 288 <if test="yn != null and yn != ''">
290 289 and u.yn = #{yn,jdbcType=INTEGER}
291   - and ur.yn = #{yn,jdbcType=INTEGER}
292 290 </if>
293 291 <if test="type != null ">
294 292 and u.type = #{type,jdbcType=INTEGER}