Commit 62ef06bc authored by 韩桐桐's avatar 韩桐桐

fix(jg):1,证书管理表添加使用单位地址字段

2,移装注销和报废注销改名为注销和报废
parent 23fbdc5f
...@@ -86,6 +86,9 @@ public class JgUseRegistrationManageDto extends BaseDto { ...@@ -86,6 +86,9 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty(value = "设备使用地址") @ApiModelProperty(value = "设备使用地址")
private String equUseAddress; private String equUseAddress;
@ApiModelProperty(value = "使用单位地址")
private String useUnitAddress;
@ApiModelProperty(value = "使用单位统一信用代码-搜索使用") @ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
private String useUnitCreditCodeForSearch; private String useUnitCreditCodeForSearch;
......
...@@ -150,4 +150,10 @@ public class JgUseRegistrationManage extends BaseEntity { ...@@ -150,4 +150,10 @@ public class JgUseRegistrationManage extends BaseEntity {
@TableField("equ_use_address") @TableField("equ_use_address")
private String equUseAddress; private String equUseAddress;
/**
* 设备使用地址
*/
@TableField("use_unit_address")
private String useUnitAddress;
} }
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
tjurm.receive_company_code AS receiveCompanyCode, tjurm.receive_company_code AS receiveCompanyCode,
tjurm.certificate_no AS certificateNo, tjurm.certificate_no AS certificateNo,
tjurm.equ_category AS equCategory, tjurm.equ_category AS equCategory,
tjurm.equ_use_address AS equUseAddress tjurm.equ_use_address AS equUseAddress,
tjurm.use_unit_address AS useUnitAddress
</sql> </sql>
......
...@@ -86,12 +86,12 @@ ...@@ -86,12 +86,12 @@
"image": "upload/tzs/common/image/设备停用.png" "image": "upload/tzs/common/image/设备停用.png"
}, },
{ {
"name": "移装注销", "name": "注销",
"code": "BF_YZ", "code": "BF_YZ",
"image": "upload/tzs/common/image/移装报废.png" "image": "upload/tzs/common/image/移装报废.png"
}, },
{ {
"name": "报废注销", "name": "报废",
"code": "BF_ZX", "code": "BF_ZX",
"image": "upload/tzs/common/image/注销报废.png" "image": "upload/tzs/common/image/注销报废.png"
} }
......
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