diff --git a/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java b/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java index db3ece49..974e3bb7 100644 --- a/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java +++ b/src/main/java/com/budwk/app/flow/entity/ProcessCategory.java @@ -4,6 +4,7 @@ import com.budwk.app.base.model.BaseModel; import lombok.Getter; import lombok.Setter; import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; @Getter @Setter @@ -11,9 +12,11 @@ import org.nutz.dao.entity.annotation.*; @Comment("流程分类") public class ProcessCategory extends BaseModel { - @Id + @Name @Comment("ID") - private Long id; + @PrevInsert(uu32 = true) + @ColDefine(type = ColType.VARCHAR, width = 32) + private String id; @Comment("名称") @Column diff --git a/src/main/resources/views/layouts/v4/baseLayout.html b/src/main/resources/views/layouts/v4/baseLayout.html index 673c98d8..fc6c5931 100644 --- a/src/main/resources/views/layouts/v4/baseLayout.html +++ b/src/main/resources/views/layouts/v4/baseLayout.html @@ -381,14 +381,15 @@ .v4-logo-container { display: flex; align-items: center; - margin-right: 40px; height: 100%; + padding: 10px; + width: 250px; + justify-content: center; } .v4-logo { height: 100%; width: auto; - margin-right: 16px; } .v4-nav { diff --git a/src/main/resources/views/layouts/v4/home.html b/src/main/resources/views/layouts/v4/home.html index b8a6a8f2..0d8ddb92 100644 --- a/src/main/resources/views/layouts/v4/home.html +++ b/src/main/resources/views/layouts/v4/home.html @@ -1320,7 +1320,7 @@ layout("/layouts/v4/baseLayout.html"){ .oa-news-item-title, .oa-notice-item-title { - font-size: 14px; + font-size: 15px; font-weight: 500; color: #333; margin-bottom: 6px; diff --git a/src/main/resources/views/platform/flow/design/index.html b/src/main/resources/views/platform/flow/design/index.html index ec2ac4e8..8bf08240 100644 --- a/src/main/resources/views/platform/flow/design/index.html +++ b/src/main/resources/views/platform/flow/design/index.html @@ -29,7 +29,11 @@ layout("/layouts/platform.html"){ - + + +