Fix 3.7 beta2 (#771)

* beta2

* beta1
This commit is contained in:
REBUILD 企业管理系统 2024-06-11 22:38:15 +08:00 committed by GitHub
parent 3906ab98df
commit 357768f115
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions

View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>com.rebuild</groupId> <groupId>com.rebuild</groupId>
<artifactId>rebuild</artifactId> <artifactId>rebuild</artifactId>
<version>3.7.0-beta</version> <version>3.7.0-beta1</version>
<name>rebuild</name> <name>rebuild</name>
<description>Building your business-systems freely!</description> <description>Building your business-systems freely!</description>
<url>https://getrebuild.com/</url> <url>https://getrebuild.com/</url>

View file

@ -75,7 +75,7 @@ public class Application implements ApplicationListener<ApplicationStartedEvent>
/** /**
* Rebuild Version * Rebuild Version
*/ */
public static final String VER = "3.7.0-beta"; public static final String VER = "3.7.0-beta1";
/** /**
* Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2} * Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2}
*/ */

View file

@ -67,7 +67,9 @@
<label class="custom-control custom-control-sm custom-checkbox custom-control-inline mb-0 when-approve"> <label class="custom-control custom-control-sm custom-checkbox custom-control-inline mb-0 when-approve">
<input class="custom-control-input" type="checkbox" value="128" /> <input class="custom-control-input" type="checkbox" value="128" />
<span class="custom-control-label">[[${bundle.L('审批通过时')}]]</span> <span class="custom-control-label">[[${bundle.L('审批通过时')}]]</span>
<a class="ml-1 bosskey-show" th:title="${bundle.L('指定步骤')}" data-toggle="tooltip"><i class="icon zmdi zmdi-settings fs-15"></i></a> <span class="bosskey-show">
<a class="ml-1" th:title="${bundle.L('指定步骤')}" data-toggle="tooltip"><i class="icon zmdi zmdi-settings fs-15"></i></a>
</span>
</label> </label>
<label class="custom-control custom-control-sm custom-checkbox custom-control-inline mb-0"> <label class="custom-control custom-control-sm custom-checkbox custom-control-inline mb-0">
<input class="custom-control-input" type="checkbox" value="256" /> <input class="custom-control-input" type="checkbox" value="256" />

View file

@ -14,7 +14,7 @@ See LICENSE and COMMERCIAL in the project root for license information.
.bosskey-show, .bosskey-show,
.admin-show { .admin-show {
display: none !important; display: none;
} }
html.admin .admin-show { html.admin .admin-show {