Browse Source

更新字段变更

tags/v2.4.1
xiaoying 1 year ago
parent
commit
ea2f8f9f0d
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      tuoheng_oidc_admin/src/main/java/com/tuoheng/model/entity/TenantItem.java
  2. +2
    -2
      tuoheng_oidc_admin/src/main/resources/mapper/TenantItemMapper.xml
  3. BIN
      tuoheng_oidc_admin/target/classes/com/tuoheng/model/param/ClientRoleDto.class
  4. +1
    -1
      tuoheng_oidc_admin/target/classes/mapper/TenantMapper.xml

+ 1
- 1
tuoheng_oidc_admin/src/main/java/com/tuoheng/model/entity/TenantItem.java View File

@@ -47,7 +47,7 @@ public class TenantItem implements Serializable {
/**
* 销售人员id
*/
private Long mrakerId;
private Long markerId;

/**
* 租户id

+ 2
- 2
tuoheng_oidc_admin/src/main/resources/mapper/TenantItemMapper.xml View File

@@ -10,7 +10,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createUser" column="create_user" jdbcType="BIGINT"/>
<result property="updateUser" column="update_user" jdbcType="BIGINT"/>
<result property="mrakerId" column="mraker_id" jdbcType="BIGINT"/>
<result property="markerId" column="marker_id" jdbcType="BIGINT"/>
<result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
<result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
<result property="contractCode" column="contract_code" jdbcType="VARCHAR"/>
@@ -20,7 +20,7 @@

<sql id="Base_Column_List">
id,create_time,update_time,
create_user,update_user,mraker_id,
create_user,update_user,marker_id,
tenant_id,project_code,contract_code,
begin_time,end_time
</sql>

BIN
tuoheng_oidc_admin/target/classes/com/tuoheng/model/param/ClientRoleDto.class View File


+ 1
- 1
tuoheng_oidc_admin/target/classes/mapper/TenantMapper.xml View File

@@ -58,7 +58,7 @@
<if test="query.username != null and query.username != ''">
and u.username LIKE concat('%',#{query.username},'%')
</if>
<if test="query.username != null">
<if test="query.status != null">
and t.status =#{query.status}
</if>
ORDER BY t.create_time desc

Loading…
Cancel
Save