Skip to content

Y
yichengstreet-be
Commit 582b5ac0 authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

Dev lb

See merge request !224
parents cb699748 8bbf4307
Pipeline #145121 failed with stages
      in 2 minutes and 38 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 6 additions and 0 deletions
      ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml
      View file @ 582b5ac0
      ...@@ -228,6 +228,9 @@ ...@@ -228,6 +228,9 @@
      <if test="wgCoordinate != null"> <if test="wgCoordinate != null">
      wg_coordinate, wg_coordinate,
      </if> </if>
      <if test="position != null">
      position,
      </if>
      </trim> </trim>
      <trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null"> <if test="id != null">
      ...@@ -293,6 +296,9 @@ ...@@ -293,6 +296,9 @@
      <if test="wgCoordinate != null"> <if test="wgCoordinate != null">
      #{wgCoordinate,jdbcType=LONGVARCHAR}, #{wgCoordinate,jdbcType=LONGVARCHAR},
      </if> </if>
      <if test="position != null">
      #{position,jdbcType=INTEGER},
      </if>
      </trim> </trim>
      </insert> </insert>
      <select id="countByExample" parameterType="com.ruoyi.system.domain.grid.GridRegionExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.ruoyi.system.domain.grid.GridRegionExample" resultType="java.lang.Long">
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment