diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java index 9548463..5e22bc5 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomer.java @@ -1,5 +1,6 @@ package com.bonus.base.api.domain; +import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,7 +13,7 @@ import lombok.Data; * @author bonus */ @Data -public class BmCustomer implements Serializable { +public class BmCustomer extends BaseEntity implements Serializable { /** * */ diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java index a2c6a20..4a93236 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/BmCustomerType.java @@ -1,5 +1,6 @@ package com.bonus.base.api.domain; +import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -15,7 +16,7 @@ import lombok.Data; @ApiModel(description="往来单位类型") @Data -public class BmCustomerType implements Serializable { +public class BmCustomerType extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml index 55e831f..bb7317c 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmProjectMapper.xml @@ -14,7 +14,7 @@ - + @@ -34,7 +34,7 @@ - id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remarks, + id, project_type, `name`, num, manager, nature, telphone, phone, fax, address, remark, material_clerk, company_id, `time`, is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, cvo, stats, htzt, is_match @@ -66,7 +66,7 @@ insert into bm_project (project_type, `name`, num, manager, nature, telphone, phone, fax, address, - remarks, material_clerk, company_id, + remark, material_clerk, company_id, `time`, is_active, lon, lat, company, imp_unit, dept_name, pro_id, dept_id, @@ -74,7 +74,7 @@ values (#{projectType,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR}, #{manager,jdbcType=VARCHAR}, #{nature,jdbcType=VARCHAR}, #{telphone,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, - #{remarks,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, + #{remark,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{time,jdbcType=VARCHAR}, '1', #{lon,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, #{company,jdbcType=VARCHAR}, #{impUnit,jdbcType=VARCHAR}, #{deptName,jdbcType=VARCHAR}, #{proId,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER}, @@ -112,8 +112,8 @@ address, - - remarks, + + remark, material_clerk, @@ -186,8 +186,8 @@ #{address,jdbcType=VARCHAR}, - - #{remarks,jdbcType=VARCHAR}, + + #{remark,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, @@ -264,8 +264,8 @@ address = #{address,jdbcType=VARCHAR}, - - remarks = #{remarks,jdbcType=VARCHAR}, + + remark = #{remark,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR}, @@ -325,7 +325,7 @@ phone = #{phone,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, - remarks = #{remarks,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR}, company_id = #{companyId,jdbcType=INTEGER}, `time` = #{time,jdbcType=VARCHAR}, @@ -359,7 +359,7 @@ phone, fax, address, - remarks, + remark, material_clerk, company_id, `time`, @@ -389,7 +389,7 @@ #{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, - #{remarks,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{time,jdbcType=VARCHAR}, @@ -419,7 +419,7 @@ phone = #{phone,jdbcType=VARCHAR}, fax = #{fax,jdbcType=VARCHAR}, address = #{address,jdbcType=VARCHAR}, - remarks = #{remarks,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR}, company_id = #{companyId,jdbcType=INTEGER}, `time` = #{time,jdbcType=VARCHAR}, @@ -470,8 +470,8 @@ address, - - remarks, + + remark, material_clerk, @@ -548,8 +548,8 @@ #{address,jdbcType=VARCHAR}, - - #{remarks,jdbcType=VARCHAR}, + + #{remark,jdbcType=VARCHAR}, #{materialClerk,jdbcType=VARCHAR}, @@ -626,8 +626,8 @@ address = #{address,jdbcType=VARCHAR}, - - remarks = #{remarks,jdbcType=VARCHAR}, + + remark = #{remark,jdbcType=VARCHAR}, material_clerk = #{materialClerk,jdbcType=VARCHAR},