diff --git a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java index 8f902a3..4ba4630 100644 --- a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java +++ b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java @@ -68,7 +68,7 @@ public class NutShiroProcessor extends AbstractProcessor { //不需要认证授权的url String[] authIgnoreUrlArr = Lang.array("/", "/sso/login", -// "/platform/login", + "/platform/login", "/platform/login(/doLogin|/logout|/captcha)", "/platform/qywechat/.*", "/platform/home/(500|403|404|UnknownAccountError|LockedAccountError)", diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java index 5b126e1..6f072a7 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java @@ -119,6 +119,7 @@ public class WelfareProjectMangeController { @At @ViReturn + @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("welfare.project.mange") public Object save(WelfareProject project) { diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java index e5582c5..ce27f71 100644 --- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java @@ -152,6 +152,14 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo @ColDefine(type = ColType.VARCHAR, width = 100) private String gift; + /** + * 职工选择福利时展示的项目提示内容,支持多行文本。 + */ + @Column + @Comment("温馨提示") + @ColDefine(type = ColType.TEXT) + private String warmTip; + @Column @Comment("弹性礼品") @ColDefine(type = ColType.MYSQL_JSON) diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 96fee3e..789adcb 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -146,6 +146,10 @@ layout("/mobile/platform.html"){ .van-submit-bar__button { width: 150px; } + + .warm-tip .van-notice-bar__content { + white-space: pre-line; + }