From 0fcedcee6689bfe498c75c8049552c22559d3aa6 Mon Sep 17 00:00:00 2001 From: canonical Date: Wed, 3 Jan 2024 21:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orm/model/OrmToManyReferenceModel.java | 16 ++++++++++++++++ .../_vfs/nop/orm/imp/template.orm.xlsx | Bin 17821 -> 17808 bytes .../testAutoExpr/output/response.json5 | 2 +- .../output/tables/nop_sys_ext_field.csv | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/nop-orm-model/src/main/java/io/nop/orm/model/OrmToManyReferenceModel.java b/nop-orm-model/src/main/java/io/nop/orm/model/OrmToManyReferenceModel.java index 1e4f2fb15..0b610cdf6 100644 --- a/nop-orm-model/src/main/java/io/nop/orm/model/OrmToManyReferenceModel.java +++ b/nop-orm-model/src/main/java/io/nop/orm/model/OrmToManyReferenceModel.java @@ -16,6 +16,22 @@ public OrmToManyReferenceModel() { } + public boolean isIgnoreDepends(){ + return false; + } + + public void setIgnoreDepends(boolean ignoreDepends){ + + } + + public OrmRefSetModel getRefSet(){ + return null; + } + + public void setRefSet(OrmRefSetModel model){ + + } + @Override public OrmDataTypeKind getKind() { return OrmDataTypeKind.TO_MANY_RELATION; diff --git a/nop-orm-model/src/main/resources/_vfs/nop/orm/imp/template.orm.xlsx b/nop-orm-model/src/main/resources/_vfs/nop/orm/imp/template.orm.xlsx index 23808ffcdbe993266affc0059fac566b90706cb8..16bd663d9d28da4beb255d250bf09fefb6dbffdd 100644 GIT binary patch delta 7070 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 delta 7071 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 Q%&jDAnJ0J$@PBCj3#F1xZU6uP diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 index 460ec2898..210462504 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/response.json5 @@ -12,7 +12,7 @@ "updateTime": "@var:NopSysNoticeTemplate@updateTime", "remark": "sss", "id": "@var:NopSysNoticeTemplate@sid", - "extCode": "D2023123001", + "extCode": "D2024123001", "extFldA": "x" }, "status": 0 diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv index 8ba719402..3a5bff2a4 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestCodeRuleAutoExpr/testAutoExpr/output/tables/nop_sys_ext_field.csv @@ -1,3 +1,3 @@ _chgType,ENTITY_NAME,ENTITY_ID,FIELD_NAME,FIELD_TYPE,DECIMAL_SCALE,DECIMAL_VALUE,DATE_VALUE,TIMESTAMP_VALUE,STRING_VALUE,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK A,io.nop.sys.dao.entity.NopSysNoticeTemplate,@var:NopSysNoticeTemplate@sid,fldA,11,,,,,x,0,autotest-ref,*,autotest-ref,*, -A,io.nop.sys.dao.entity.NopSysNoticeTemplate,@var:NopSysNoticeTemplate@sid,fldC,11,,,,,D2023123001,0,autotest-ref,*,autotest-ref,*, +A,io.nop.sys.dao.entity.NopSysNoticeTemplate,@var:NopSysNoticeTemplate@sid,fldC,11,,,,,D2024123001,0,autotest-ref,*,autotest-ref,*,