diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index b549407..a76974a 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -34,9 +34,8 @@ public abstract class BaseMdmBean extends BaseBean { public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") - @ApiParam("mdm数据版本") + @ApiParam("当前版本") @JsonSerialize(using = ToStringSerializer.class) - @AnnoOutputColumn(hidden = true) private Long mdmVersion; public long getMdmVersionVal() { diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index a35e1f0..2b968fb 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -24,7 +24,7 @@ import javax.persistence.Transient; @ApiModel("MDM业务基础bean") public class BaseMdmBusiExtdBean extends BaseMdmBean { - private static final long serialVersionUID = 4267453020130810967L; + private static final long serialVersionUID = 4267453020130811234L; @Transient @ApiParam("是否主数据") diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 874d299..91cad4f 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -21,7 +21,7 @@ public class MdmHqlPack { public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.getIsMdmPublished(), "isMdmPublished", ddlPackBean); DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; }