Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -84,7 +84,7 @@ public class WelcomeController extends WebBaseController {
      * @author : YongEn
      * @date : 2022/2/11
      */
-    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_ADD
+    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.WELCOME, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_ADD
             ,optPage = "欢迎语设置-新建欢迎语", userFunc = LogRecordUserServiceImpl.class, afterFunc = LogRecordAfterServiceImpl.class)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public RestResponse<Boolean> saveWelcome(@RequestBody @Valid SaveWelcomeQO qo) {
@@ -181,7 +181,7 @@ public class WelcomeController extends WebBaseController {
      * @author : YongEn
      * @date : 2022/2/11
      */
-    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.HUOMA, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_DEL
+    @GicLogRecord(value = "${#logContent}", category = GicLogRecordCategoryEnum.WELCOME, optType = GicLogRecordOptTypeEnum.NORMAL_WELCOME_DEL
             ,optPage = "欢迎语设置-特殊欢迎语", userFunc = LogRecordUserServiceImpl.class, afterFunc = LogRecordAfterServiceImpl.class)
     @RequestMapping(value = "/remove")
     public RestResponse<?> removeWelcome(@RequestParam("welcomeId") String welcomeId) {