XMTT 6 years ago
parent
commit
bfd3c7efad

+ 5 - 5
src/main/java/com/ekexiu/project/platform/company/CompInvite.java

@ -14,7 +14,7 @@ public class CompInvite {
14 14
    private String inviteCode;
15 15
    private String lastTime;
16 16
    private String lastInviter;
17
    private boolean active;
17
    private boolean actived;
18 18
19 19
    @Column(descp = "企业ID", value = DE.id_32)
20 20
    public String getId() {
@ -62,11 +62,11 @@ public class CompInvite {
62 62
    }
63 63
64 64
    @Column(descp = "有效标识", value = DE.boolean_de)
65
    public boolean isActive() {
66
        return active;
65
    public boolean isActived() {
66
        return actived;
67 67
    }
68 68
69
    public void setActive(boolean active) {
70
        this.active = active;
69
    public void setActived(boolean actived) {
70
        this.actived = actived;
71 71
    }
72 72
}

+ 5 - 5
src/main/java/com/ekexiu/project/platform/company/Company.java

@ -34,7 +34,7 @@ public class Company implements ManagedBaseTable {
34 34
    private String linkphone;
35 35
    private String linkemail;
36 36
37
    private boolean active;
37
    private boolean actived;
38 38
    private String activeTime;
39 39
40 40
    private String creator;
@ -223,12 +223,12 @@ public class Company implements ManagedBaseTable {
223 223
    }
224 224
225 225
    @Column(descp = "激活状态", value = DE.boolean_de)
226
    public boolean isActive() {
227
        return active;
226
    public boolean isActived() {
227
        return actived;
228 228
    }
229 229
230
    public void setActive(boolean active) {
231
        this.active = active;
230
    public void setActived(boolean actived) {
231
        this.actived = actived;
232 232
    }
233 233
234 234
    @Column(descp = "激活时间", value = DE.DateTime_de)

+ 5 - 5
src/main/java/com/ekexiu/project/platform/product/Product.java

@ -24,7 +24,7 @@ public class Product implements ManagedBaseTable {
24 24
    private String price;
25 25
    private String parameter;
26 26
27
    private boolean active;
27
    private boolean actived;
28 28
29 29
    private String creator;
30 30
    private String modifier;
@ -131,12 +131,12 @@ public class Product implements ManagedBaseTable {
131 131
    }
132 132
133 133
    @Column(descp="有效标识",value = DE.boolean_de)
134
    public boolean isActive() {
135
        return active;
134
    public boolean isActived() {
135
        return actived;
136 136
    }
137 137
138
    public void setActive(boolean active) {
139
        this.active = active;
138
    public void setActived(boolean actived) {
139
        this.actived = actived;
140 140
    }
141 141
142 142
    @Column(descp="创建人ID",value = DE.id_32)

+ 6 - 6
src/main/resources/database.sql

@ -49,7 +49,7 @@ CREATE TABLE PRODUCT (
49 49
        PRODUCING_AREA TEXT,
50 50
        PRICE TEXT,
51 51
        PARAMETER TEXT,
52
        ACTIVE CHAR(1) NOT NULL,
52
        ACTIVED CHAR(1) NOT NULL,
53 53
        CREATOR CHAR(32) NOT NULL,
54 54
        MODIFIER CHAR(32) NOT NULL,
55 55
        CREATE_TIME CHAR(14) NOT NULL,
@ -67,7 +67,7 @@ COMMENT ON COLUMN PRODUCT.SPEC IS '厂商型号';
67 67
COMMENT ON COLUMN PRODUCT.PRODUCING_AREA IS '产地';
68 68
COMMENT ON COLUMN PRODUCT.PRICE IS '价格';
69 69
COMMENT ON COLUMN PRODUCT.PARAMETER IS '性能参数';
70
COMMENT ON COLUMN PRODUCT.ACTIVE IS '有效标识';
70
COMMENT ON COLUMN PRODUCT.ACTIVED IS '有效标识';
71 71
COMMENT ON COLUMN PRODUCT.CREATOR IS '创建人ID';
72 72
COMMENT ON COLUMN PRODUCT.MODIFIER IS '最后修改人';
73 73
COMMENT ON COLUMN PRODUCT.CREATE_TIME IS '创建时间(YYYYMMDDHH24MISS)不可修改';
@ -251,14 +251,14 @@ CREATE TABLE COMP_INVITE (
251 251
        INVITE_CODE TEXT NOT NULL,
252 252
        LAST_TIME CHAR(14) NOT NULL,
253 253
        LAST_INVITER CHAR(32) NOT NULL,
254
        ACTIVE CHAR(1) NOT NULL);
254
        ACTIVED CHAR(1) NOT NULL);
255 255
COMMENT ON TABLE COMP_INVITE IS '企业邀请表';
256 256
COMMENT ON COLUMN COMP_INVITE.ID IS '企业ID';
257 257
COMMENT ON COLUMN COMP_INVITE.EMAIL IS '联系邮箱';
258 258
COMMENT ON COLUMN COMP_INVITE.INVITE_CODE IS '邀请码';
259 259
COMMENT ON COLUMN COMP_INVITE.LAST_TIME IS '最后邀请时间';
260 260
COMMENT ON COLUMN COMP_INVITE.LAST_INVITER IS '最后邀请人';
261
COMMENT ON COLUMN COMP_INVITE.ACTIVE IS '有效标识';
261
COMMENT ON COLUMN COMP_INVITE.ACTIVED IS '有效标识';
262 262
create sequence company_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
263 263
CREATE TABLE COMPANY (
264 264
        ID CHAR(32) NOT NULL,
@ -281,7 +281,7 @@ CREATE TABLE COMPANY (
281 281
        DEPARTMENT TEXT,
282 282
        LINKPHONE TEXT,
283 283
        LINKEMAIL TEXT,
284
        ACTIVE CHAR(1) NOT NULL,
284
        ACTIVED CHAR(1) NOT NULL,
285 285
        ACTIVE_TIME CHAR(14),
286 286
        CREATOR CHAR(32) NOT NULL,
287 287
        MODIFIER CHAR(32) NOT NULL,
@ -309,7 +309,7 @@ COMMENT ON COLUMN COMPANY.JOB IS '联系人职位';
309 309
COMMENT ON COLUMN COMPANY.DEPARTMENT IS '所在部门';
310 310
COMMENT ON COLUMN COMPANY.LINKPHONE IS '联系人电话';
311 311
COMMENT ON COLUMN COMPANY.LINKEMAIL IS '联系人邮箱';
312
COMMENT ON COLUMN COMPANY.ACTIVE IS '激活状态';
312
COMMENT ON COLUMN COMPANY.ACTIVED IS '激活状态';
313 313
COMMENT ON COLUMN COMPANY.ACTIVE_TIME IS '激活时间';
314 314
COMMENT ON COLUMN COMPANY.CREATOR IS '创建人ID';
315 315
COMMENT ON COLUMN COMPANY.MODIFIER IS '最后修改人ID';