bugfix

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/EntityModel.java

@@ -739,6 +739,7 @@ public class EntityModel  extends BaseModel {
                     if(der1n.getPSOne2ManyDataDEField()!=null&&der1n.getPSOne2ManyDataDEField().isPhisicalDEField()&&der1n.getMinorPSDataEntity().getStorageMode()==0)
                     {
                         rel.setColumnName(der1n.getPSOne2ManyDataDEField().getName().toLowerCase());
+                        rel.setCodeName(der1n.getPSOne2ManyDataDEField().getCodeName());
                     }
 
                     rel.setFkFieldCodeName(der1n.getPSPickupDEField().getCodeName());

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/RelationshipModel.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import net.ibizsys.model.dataentity.defield.IPSDEField;
+import net.ibizsys.model.dataentity.der.IPSDER1N;
 import net.ibizsys.model.dataentity.der.IPSDERBase;
 
 import org.springframework.util.ObjectUtils;
@@ -68,7 +69,13 @@ public class RelationshipModel extends BaseModel{
 
     public String getListCode()
     {
-        if(this.getDer().getMinorPSDataEntity().getStorageMode()==0)
+        IPSDER1N der1n = null;
+        if(this.getDer() instanceof IPSDER1N) {
+            der1n = (IPSDER1N) getDer();
+        }
+        if(der1n!=null && der1n.getPSOne2ManyDataDEField()!=null&&der1n.getPSOne2ManyDataDEField().isPhisicalDEField()&&der1n.getMinorPSDataEntity().getStorageMode()==0)
+            return der1n.getPSOne2ManyDataDEField().getCodeName().toLowerCase();
+        else if(this.getDer().getMinorPSDataEntity().getStorageMode()==0)
             return StringAdvUtils.pluralize(getCodeName());
         return null;
     }

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/utils/Inflector.java

@@ -48,7 +48,6 @@ public class Inflector {
 		plural("(?:([^f])fe|([lr])f)$", "$1$2ves");
 		plural("(hive)$", "$1s");
 		plural("([^aeiouy]|qu)y$", "$1ies");
-		plural("([^aeiouy]|qu)ies$", "$1y");
 		plural("(x|ch|ss|sh)$", "$1es");
 		plural("(matr|vert|ind)ix|ex$", "$1ices");
 		plural("([m|l])ouse$", "$1ice");

modules/ibizlab-template/ibizlab-template-ibizedge/src/main/resources/templ/{{projectName}}-core/src/main/java/{{packageName}}/{{apis}}/dto/{{apiDtos@DEFAULT}}.java.hbs

@@ -61,7 +61,7 @@ public class {{apiDto.codeName}} extends {{#eq apiDto.apiEntity.entity.psSubSysS
      */
     public void set{{pascalCase codeName}}({{javaType}} {{camelCase codeName}}) {
         this.{{camelCase codeName}} = {{camelCase codeName}};
-        this.modify("{{lowerCase name}}", {{camelCase codeName}});
+        this.modify("{{lowerCase codeName}}", {{camelCase codeName}});
     }
 
             {{/unless}}