Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-11-30 6cf7e063aa0c486c81beb6ed89386b501ad879f1

Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

# Conflicts:
#	zq-erp/pom.xml
#	zq-erp/src/main/resources/templates/views/super/sysCompany-form.html

 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>

 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"
                         ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
                         nullmsg="网站不能为空">
                <div class="Validform_checktip"></div>
            </div>