删除注释

.idea/workspace.xml

@@ -6,66 +6,41 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="上传项目">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+    <list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/framework-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/framework-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generator/target/generator-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/generator-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Members.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Members.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersPage.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersPage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersUpdate.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersUpdate.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Members$FieldEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Members$FieldEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Members.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Members.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Survey.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/entity/Survey.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembers.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembers.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembersPage.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembersPage.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembersUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/EnterpriseMembersUpdate.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/PersonalMembers.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/PersonalMembers.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/SurveyAdd.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/param/SurveyAdd.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/utils/SendMail.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/utils/SendMail.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/spring-boot-plus.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/system/target/system-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/system-2.0.jar" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -171,7 +146,7 @@
       <recent name="D:\next\ctms\7SPMS\SPMS-api\example\src\main\resources\mapper" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.SendMail (1)">
+  <component name="RunManager" selected="Spring Boot.SpringBootPlusApplication">
     <configuration name="IdCardUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.hongxinhui.utils.IdCardUtil" />
       <module name="hongxinhui" />
@@ -257,9 +232,9 @@
       <item itemvalue="Application.SpringBootPlusGenerator" />
       <item itemvalue="Application.PhoneUtil" />
       <item itemvalue="Application.SendMail" />
+      <item itemvalue="Application.SendMail (1)" />
       <item itemvalue="Spring Boot.SpringBootPlusAdminApplication" />
       <item itemvalue="Spring Boot.SpringBootPlusApplication" />
-      <item itemvalue="Application.SendMail (1)" />
     </list>
     <recent_temporary>
       <list>
@@ -479,7 +454,15 @@
       <workItem from="1627020893521" duration="3007000" />
       <workItem from="1627270057465" duration="2050000" />
       <workItem from="1627444640962" duration="144000" />
-      <workItem from="1627444812428" duration="1392000" />
+      <workItem from="1627444812428" duration="1651000" />
+      <workItem from="1627455585837" duration="1662000" />
+      <workItem from="1627521925375" duration="700000" />
+      <workItem from="1627522768254" duration="3859000" />
+      <workItem from="1627608006311" duration="591000" />
+      <workItem from="1627618965831" duration="3903000" />
+      <workItem from="1627866976728" duration="6777000" />
+      <workItem from="1627953723969" duration="13000" />
+      <workItem from="1627953770588" duration="801000" />
     </task>
     <task id="LOCAL-00001" summary="上传项目">
       <created>1625797686627</created>
@@ -488,7 +471,14 @@
       <option name="project" value="LOCAL" />
       <updated>1625797686627</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="增加注册成功发送邮件">
+      <created>1627454903771</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1627454903771</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -496,7 +486,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="上传项目" />
-    <option name="LAST_COMMIT_MESSAGE" value="上传项目" />
+    <MESSAGE value="增加注册成功发送邮件" />
+    <option name="LAST_COMMIT_MESSAGE" value="增加注册成功发送邮件" />
   </component>
   <component name="WindowStateProjectService">
     <state x="361" y="74" key="#Plugins" timestamp="1624963006648">
@@ -543,22 +534,22 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1625797418458" />
-    <state width="1493" height="104" key="GridCell.Tab.0.bottom" timestamp="1627454864803">
+    <state width="1493" height="286" key="GridCell.Tab.0.bottom" timestamp="1627886185742">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="104" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1627454864803" />
-    <state width="1493" height="104" key="GridCell.Tab.0.center" timestamp="1627454864801">
+    <state width="1493" height="286" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1627886185742" />
+    <state width="1493" height="286" key="GridCell.Tab.0.center" timestamp="1627886185741">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="104" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1627454864801" />
-    <state width="1493" height="104" key="GridCell.Tab.0.left" timestamp="1627454864801">
+    <state width="1493" height="286" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1627886185741" />
+    <state width="1493" height="286" key="GridCell.Tab.0.left" timestamp="1627886185741">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="104" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1627454864801" />
-    <state width="1493" height="104" key="GridCell.Tab.0.right" timestamp="1627454864802">
+    <state width="1493" height="286" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1627886185741" />
+    <state width="1493" height="286" key="GridCell.Tab.0.right" timestamp="1627886185741">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="104" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1627454864802" />
+    <state width="1493" height="286" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1627886185741" />
     <state width="1493" height="281" key="GridCell.Tab.1.bottom" timestamp="1627033614869">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -587,10 +578,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="249" y="0" width="1250" height="824" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1625044058689" />
-    <state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1625797719831">
+    <state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1627454905445">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1625797719831" />
+    <state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1627454905445" />
     <state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1625564074239">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -611,10 +602,10 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1625021359303" />
-    <state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1627445579354">
+    <state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1627886158617">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1627445579354" />
+    <state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1627886158617" />
     <state x="550" y="185" key="git4idea.merge.GitPullDialog" timestamp="1625797427678">
       <screen x="0" y="0" width="1536" height="824" />
     </state>

admin/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:15 CST 2021
+#Mon Aug 02 14:36:44 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=admin

bootstrap/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:54 CST 2021
+#Mon Aug 02 14:37:36 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=bootstrap

config/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:19 CST 2021
+#Mon Aug 02 14:36:51 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=config

distribution/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:54 CST 2021
+#Mon Aug 02 14:37:37 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=distribution

framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2021-07-28T12:13:24+0800",
+    date = "2021-08-02T14:36:57+0800",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
 )
 public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert {

framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2021-07-28T12:13:25+0800",
+    date = "2021-08-02T14:36:57+0800",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
 )
 public class ShiroMapstructConvertImpl implements ShiroMapstructConvert {

framework/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:29 CST 2021
+#Mon Aug 02 14:37:01 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=framework

generator/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:57 CST 2021
+#Mon Aug 02 14:37:39 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=generator

hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java

@@ -47,7 +47,7 @@ public class Survey extends BaseEntity {
     private String querycode;
 
     @ApiModelProperty("金额（万元）")
-    private Double money;
+    private String money;
 
     @ApiModelProperty("备案申请方")
     @TableField("filingApplicant")
@@ -58,7 +58,7 @@ public class Survey extends BaseEntity {
     private String managePeo;
 
     @ApiModelProperty("期限（月）")
-    private Date term;
+    private String term;
 
     @ApiModelProperty("年化收益率（%）")
     @TableField("annualizedYield")

hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java

@@ -74,8 +74,6 @@ public class EnterpriseMembers extends BaseEntity {
     @ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
     private Integer mtype;
 
-    @ApiModelProperty(value = "密码没加密的",required = true)
-    private String pwd;
 
     @ApiModelProperty(value = "密码md5的",required = true)
     private String password;

hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java

@@ -46,9 +46,6 @@ public class PersonalMembers extends BaseEntity {
 //    @ApiModelProperty(value = "openid",required = true)
 //    private String openid;
 
-    @ApiModelProperty(value = "密码没加密的",required = true)
-    private String pwd;
-
     @ApiModelProperty(value = "密码",required = true)
     private String password;
 

hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java

@@ -45,7 +45,7 @@ public class SurveyAdd {
     private Date registerTime;
 
     @ApiModelProperty("期限（月）")
-    private Date term;
+    private String term;
 
     @ApiModelProperty("年化收益率（%）")
     @TableField("annualizedYield")

hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java

@@ -175,7 +175,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
             return hashMap;
         }
         members = new Members();
-        members.setPassword(personalMembers.getPassword());//DigestUtils.md5Hex(
+        members.setPassword(DigestUtils.md5Hex(personalMembers.getPassword()));//
         members.setName(personalMembers.getName());
         members.setPhone(personalMembers.getPhone());
         members.setEmail(personalMembers.getEmail());//邮箱
@@ -183,7 +183,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
         members.setIdcard(personalMembers.getIdcard());
         //个人用户类型
         members.setUserType(1);
-        members.setPwd(personalMembers.getPwd());
+        members.setPwd(personalMembers.getPassword());
         int insert = membersMapper.insert(members);
         if(insert>0){
             hashMap.put("code","200");
@@ -191,7 +191,12 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
 
             SendMail sendMail = new SendMail();
             sendMail.setSubject("请保管好您的账号密码");
-            sendMail.setContent("请保管好您的账号密码：</br>账号："+personalMembers.getPhone()+"</br>密码："+personalMembers.getPwd());
+//            sendMail.setContent("请保管好您的账号密码：</br>账号："+personalMembers.getPhone()+"</br>密码："+personalMembers.getPassword());
+            sendMail.setContent("尊敬的会员：您好!\n" +
+                    "感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
+                    "您的登录账号为：  "+personalMembers.getPhone()+"  ；密码为  ："+personalMembers.getPassword()+"\n" +
+                    "重要提示：请妥善保管您的会员账号和密码；若忘记登录密码，请申请重置密码。如有任何疑问可通过以下方式联系我方，非常感谢您的理解与支持。有疑问通过以下方式咨询：xiangmubu@hxhsevice.com\n" +
+                    "宜春弘鑫汇资产服务有限公司");
             //收件人电子邮箱
             sendMail.setToAccount(personalMembers.getEmail());
             //抄送人电子邮箱
@@ -245,8 +250,8 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
         BeanUtils.copyProperties(enterpriseMembers, members);
         //企业用户类型
         members.setUserType(2);
-        members.setPassword(enterpriseMembers.getPassword());
-        members.setPwd(enterpriseMembers.getPwd());
+        members.setPassword(DigestUtils.md5Hex(enterpriseMembers.getPassword()));
+        members.setPwd(enterpriseMembers.getPassword());
         int insert = membersMapper.insert(members);
         if(insert>0){
             hashMap.put("code","200");
@@ -254,7 +259,12 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
 
             SendMail sendMail = new SendMail();
             sendMail.setSubject("请保管好您的账号密码");
-            sendMail.setContent("请保管好您的账号密码：</br>账号："+enterpriseMembers.getPhone()+"</br>密码："+enterpriseMembers.getPwd());
+//            sendMail.setContent("请保管好您的账号密码：</br>账号："+enterpriseMembers.getPhone()+"</br>密码："+enterpriseMembers.getPassword());
+            sendMail.setContent("尊敬的会员：您好!\n" +
+                    "感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
+                    "您的登录账号为：  "+enterpriseMembers.getPhone()+"  ；密码为  ："+enterpriseMembers.getPassword()+"\n" +
+                    "重要提示：请妥善保管您的会员账号和密码；若忘记登录密码，请申请重置密码。如有任何疑问可通过以下方式联系我方，非常感谢您的理解与支持。有疑问通过以下方式咨询：xiangmubu@hxhsevice.com\n" +
+                    "宜春弘鑫汇资产服务有限公司");
             //收件人电子邮箱
             sendMail.setToAccount(enterpriseMembers.getEmail());
             //抄送人电子邮箱
@@ -495,7 +505,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
                 notice.setTypeStr(noticetype.getName());
             }
             notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
-            System.out.println("notice.getContent() = " + notice.getContent());
+//            System.out.println("notice.getContent() = " + notice.getContent());
         }
         hashMap.put("code","200");
         hashMap.put("info","查询成功");

hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java

@@ -97,7 +97,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
                 notice.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
             }
             notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
-            System.out.println("notice.getContent() = " + notice.getContent());
+//            System.out.println("notice.getContent() = " + notice.getContent());
         }
         return new Paging<Notice>(iPage);
     }

hongxinhui/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:47 CST 2021
+#Mon Aug 02 14:37:27 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=example

scheduled/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:58 CST 2021
+#Mon Aug 02 14:37:40 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=scheduled

system/target/maven-archiver/pom.properties

 #Generated by Maven
-#Wed Jul 28 12:13:49 CST 2021
+#Mon Aug 02 14:37:32 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=system