From 6cf7e063aa0c486c81beb6ed89386b501ad879f1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 30 Nov 2021 21:01:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/templates/views/super/sysCompany-form.html | 25 +++++++++++++------------
zq-erp/pom.xml | 2 --
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 84c6f8e..4049589 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -414,11 +414,9 @@
<exclude>config/xcshop/*</exclude>
<!-- -->
-
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
-
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
diff --git a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
index bf5bf7e..ab047f8 100644
--- a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
+++ b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
@@ -70,10 +70,11 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">网站地址</label>
+ <label class="col-sm-2 control-label">网站地址<span
+ class="text-danger">*</span></label>
<div class="col-sm-4">
- <input type="text" class="form-control"
- th:value="${obj.comWebUrl }" name="comWebUrl"
+ <input type="text" class="form-control"
+ ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
nullmsg="网站不能为空">
<div class="Validform_checktip"></div>
</div>
@@ -86,16 +87,16 @@
</div>
</div>
- <div class="form-group">
- <label class="col-sm-2 control-label">公司编码<span
- class="text-danger">*</span></label>
- <div class="col-sm-4">
- <input type="text" dataType="*1-100" class="form-control"
- name="comCode" th:value="${obj.comCode }"
- nullmsg="公司编码不能为空">
- <div class="Validform_checktip"></div>
- </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">公司编码<span
+ class="text-danger">*</span></label>
+ <div class="col-sm-4">
+ <input type="text" dataType="*1-100" class="form-control"
+ name="comCode" th:value="${obj.comCode }"
+ nullmsg="公司编码不能为空">
+ <div class="Validform_checktip"></div>
</div>
+ </div>
<div class="form-group">
<label class="col-sm-2 control-label">企业功能</label>
<div class=" ztree col-sm-9" id="treeDemo"></div>
--
Gitblit v1.9.1