Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsExam

ds-base/.idea/compiler.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="ds-base" />
+      </profile>
+    </annotationProcessing>
+  </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
   </component>

ds-base/.idea/ds-base.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>

ds-base/.idea/encodings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

ds-base/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="ali-maven" />
+      <option name="name" value="ali-maven" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>

ds-base/.idea/misc.xml

@@ -7,6 +7,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>

ds-base/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ds-base.iml" filepath="$PROJECT_DIR$/ds-base.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/ds-base.iml" filepath="$PROJECT_DIR$/.idea/ds-base.iml" />
     </modules>
   </component>
 </project>

ds-base/WebRoot/html/pages/tea/add.html

@@ -106,10 +106,10 @@
         </div>
         <div class="layui-form-item">
             <label for="card" class="layui-form-label">
-                出生日期：
+                <span class="we-red">*</span>出生日期：
             </label>
             <div class="layui-input-inline ">
-                <input type="text" class="layui-input" id="test" name="birthday" placeholder="yyyy-MM-dd">
+                <input type="text" class="layui-input" id="test" lay-verify="required" name="birthday" placeholder="yyyy-MM-dd">
             </div>
         </div>
         <div class="layui-form-item">

ds-base/WebRoot/html/pages/tea/edit.html

@@ -96,10 +96,10 @@
         </div>
         <div class="layui-form-item">
             <label for="card" class="layui-form-label">
-                出生日期：
+                <span class="we-red">*</span>出生日期：
             </label>
             <div class="layui-input-inline ">
-                <input type="text" class="layui-input" id="test" name="birthday" placeholder="yyyy-MM-dd">
+                <input type="text" class="layui-input" id="test" lay-verify="required" name="birthday" placeholder="yyyy-MM-dd">
             </div>
         </div>
         <div class="layui-form-item">