Merge remote-tracking branch 'origin/master'

# Conflicts:
#	bound-link-api/blink-portal/src/main/java/com/wx/blink/portal/controller/PortalController.java

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkActivityAttachmentController.java

@@ -0,0 +1,47 @@
+package com.wx.blink.backend.controller;
+
+import com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO;
+import com.wx.blink.backend.domain.qry.BlinkActivityAttachmentQry;
+import com.wx.blink.backend.service.IBlinkActivityAttachmentService;
+import com.wx.blink.base.common.domain.PageResult;
+import com.wx.blink.base.common.domain.ResponseDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@RestController
+@Tag(name = "活动附件")
+public class BlinkActivityAttachmentController {
+
+    @Resource
+    private IBlinkActivityAttachmentService attachmentService;
+
+    @Operation(summary = "新增附件")
+    @PostMapping("/supports/activity/attachment/create")
+    public ResponseDTO<String> supportsActivityAttachmentCreate(@RequestBody @Valid BlinkActivityAttachmentDTO dto) {
+        return attachmentService.supportsActivityAttachmentCreate(dto);
+    }
+
+    @Operation(summary = "分页查询活动附件列表")
+    @GetMapping("/supports/activity/attachment/queryPage")
+    public ResponseDTO<PageResult<BlinkActivityAttachmentDTO>> supportsActivityAttachmentQueryPage(BlinkActivityAttachmentQry qry) {
+        return attachmentService.supportsActivityAttachmentQueryPage(qry);
+    }
+
+    @Operation(summary = "获取活动附件信息")
+    @GetMapping("/supports/activity/attachment/{id}")
+    public ResponseDTO<BlinkActivityAttachmentDTO> supportsActivityAttachmentQuery(@PathVariable("id") Long id) {
+        return attachmentService.supportsActivityAttachmentQuery(id);
+    }
+
+    @Operation(summary = "删除活动附件")
+    @GetMapping("/supports/activity/attachment/delete/{id}")
+    public ResponseDTO<String> supportsActivityAttachmentDeleteById(@PathVariable("id") Long id) {
+        return attachmentService.supportsActivityAttachmentDeleteById(id);
+    }
+
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkProviderController.java

@@ -1,5 +1,6 @@
 package com.wx.blink.backend.controller;
 
+import com.wx.blink.base.common.annoation.NoNeedLogin;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.backend.domain.qry.BlinkProviderQry;
@@ -22,6 +23,7 @@ public class BlinkProviderController {
     @Resource
     private IBlinkProviderService providerService;
 
+    @NoNeedLogin
     @Operation(summary = "服务商创建")
     @PostMapping("/supports/provider/create")
     public ResponseDTO<String> providerCreate(@RequestBody BlinkProviderDTO dto) {

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/CountryController.java

@@ -0,0 +1,29 @@
+package com.wx.blink.backend.controller;
+
+import com.wx.blink.backend.domain.dataobject.CountryDO;
+import com.wx.blink.backend.repository.CountryRepository;
+import com.wx.blink.base.common.annoation.NoNeedLogin;
+import com.wx.blink.base.common.domain.ResponseDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Tag(name = "国家管理")
+public class CountryController {
+
+    @Resource
+    private CountryRepository repository;
+
+    @Operation(summary = "查询国家列表")
+    @GetMapping("/supports/country/query")
+    @NoNeedLogin
+    public ResponseDTO<List<CountryDO>> supportsCountryQuery() {
+        return ResponseDTO.ok(repository.selectList(null));
+    }
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkActivityAttachmentDO.java

@@ -0,0 +1,34 @@
+package com.wx.blink.backend.domain.dataobject;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.wx.blink.base.common.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+@TableName("blink_activity_attachment")
+public class BlinkActivityAttachmentDO extends BaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 附件
+     */
+    private String attachment;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 活动ID
+     */
+    private Long activityId;
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/CountryDO.java

@@ -0,0 +1,58 @@
+package com.wx.blink.backend.domain.dataobject;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("country")
+public class CountryDO {
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 国家/国家特别行政区英文全名
+     */
+    private String nameEn;
+
+    /**
+     * 国家/国家特别行政区中文名
+     */
+    private String nameZh;
+
+    /**
+     * 国际/国家特别行政区域名缩写
+     */
+    private String nameInternationalAbbr;
+
+    /**
+     * 国家/国家特别行政区电话代码
+     */
+    private Integer countryPhoneCode;
+
+    /**
+     * 国家/国家特别行政区所属洲，例如：亚洲，非洲...
+     */
+    private String zone;
+
+    /**
+     * 所属分区，如中东，有别于洲，但也形成了比较通俗的划分
+     */
+    private String zoneAlias;
+
+    /**
+     * 国家/国家特别行政区所处纬度
+     */
+    private String lat;
+
+    /**
+     * 国家/国家特别行政区所处经度
+     */
+    private String lon;
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkActivityAttachmentDTO.java

@@ -0,0 +1,37 @@
+package com.wx.blink.backend.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wx.blink.base.common.domain.BaseEntity;
+import com.wx.blink.base.common.json.deserializer.FileKeyVoDeserializer;
+import com.wx.blink.base.common.json.serializer.FileKeyVoSerializer;
+import lombok.Data;
+
+@Data
+public class BlinkActivityAttachmentDTO extends BaseEntity {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 附件
+     */
+    @JsonDeserialize(using = FileKeyVoDeserializer.class)
+    @JsonSerialize(using = FileKeyVoSerializer.class)
+    private String attachment;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 活动ID
+     */
+    private Long activityId;
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/qry/BlinkActivityAttachmentQry.java

@@ -0,0 +1,19 @@
+package com.wx.blink.backend.domain.qry;
+
+import com.wx.blink.base.common.domain.PageParam;
+import lombok.Data;
+
+@Data
+public class BlinkActivityAttachmentQry extends PageParam {
+
+    /**
+     * 活动ID
+     */
+    private Long activityId;
+
+    /**
+     * 附件类型
+     * */
+    private String type;
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkActivityAttachmentServiceImpl.java

@@ -0,0 +1,97 @@
+package com.wx.blink.backend.manager;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wx.blink.backend.domain.dataobject.BlinkActivityAttachmentDO;
+import com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO;
+import com.wx.blink.backend.domain.qry.BlinkActivityAttachmentQry;
+import com.wx.blink.backend.objectmapper.BlinkActivityAttachmentMapper;
+import com.wx.blink.backend.repository.BlinkActivityAttachmentRepository;
+import com.wx.blink.backend.service.IBlinkActivityAttachmentService;
+import com.wx.blink.base.common.domain.PageResult;
+import com.wx.blink.base.common.domain.ResponseDTO;
+import com.wx.blink.base.common.util.BlinkEntityUtil;
+import com.wx.blink.base.common.util.BlinkPageUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class BlinkActivityAttachmentServiceImpl extends ServiceImpl<BlinkActivityAttachmentRepository, BlinkActivityAttachmentDO> implements IBlinkActivityAttachmentService {
+
+    @Resource
+    private BlinkActivityAttachmentRepository repository;
+    @Resource
+    private BlinkActivityAttachmentMapper mapper;
+
+    /**
+     * 新增活动附件
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResponseDTO<String> supportsActivityAttachmentCreate(BlinkActivityAttachmentDTO dto) {
+        // 生成DO
+        BlinkActivityAttachmentDO activityAttachmentDO = new BlinkActivityAttachmentDO();
+        mapper.toBlinkActivityAttachmentDO(dto, activityAttachmentDO);
+        // 创建人赋值
+        BlinkEntityUtil.setCreateInfo(activityAttachmentDO);
+        // 执行新增
+        this.save(activityAttachmentDO);
+        return ResponseDTO.ok();
+    }
+
+    /**
+     * 分页查询活动附件列表
+     *
+     * @param qry
+     * @return
+     */
+    @Override
+    public ResponseDTO<PageResult<BlinkActivityAttachmentDTO>> supportsActivityAttachmentQueryPage(BlinkActivityAttachmentQry qry) {
+        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
+        List<BlinkActivityAttachmentDTO> activityAttachmentDTOS = repository.supportsActivityAttachmentQueryPage(page, qry);
+        PageResult<BlinkActivityAttachmentDTO> pageResult = BlinkPageUtil.convert2PageResult(page, activityAttachmentDTOS);
+        return ResponseDTO.ok(pageResult);
+    }
+
+    /**
+     * 获取活动附件信息
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseDTO<BlinkActivityAttachmentDTO> supportsActivityAttachmentQuery(Long id) {
+        BlinkActivityAttachmentDTO activityAttachmentDTO = repository.supportsActivityAttachmentQuery(id);
+        if (!Objects.nonNull(activityAttachmentDTO)) {
+            return ResponseDTO.dataErrorParam("活动附件不存在!请检查");
+        }
+        return ResponseDTO.ok(activityAttachmentDTO);
+    }
+
+    /**
+     * 移除活动附件
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseDTO<String> supportsActivityAttachmentDeleteById(Long id) {
+        BlinkActivityAttachmentDO activityAttachmentDO = this.getById(id);
+        if (!Objects.nonNull(activityAttachmentDO)){
+            return ResponseDTO.dataErrorParam("活动附件不存在!请检查");
+        }
+        // 执行假删除
+        activityAttachmentDO.setDeletedFlag(1);
+        // 修改人赋值
+        BlinkEntityUtil.setUpdatedInfo(activityAttachmentDO);
+        this.updateById(activityAttachmentDO);
+        return ResponseDTO.ok();
+    }
+
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkActivityMemberServiceImpl.java

@@ -57,13 +57,11 @@ public class BlinkActivityMemberServiceImpl extends ServiceImpl<BlinkActivityMem
      */
     @Override
     public ResponseDTO<BlinkActivityMemberDTO> supportsActivityMemberQuery(Long id) {
-        BlinkActivityMemberDO activityMemberDO = this.getById(id);
-        if (!Objects.nonNull(activityMemberDO)) {
+        BlinkActivityMemberDTO activityMemberDTO = repository.supportsActivityMemberQuery(id);
+        if (!Objects.nonNull(activityMemberDTO)) {
             return ResponseDTO.dataErrorParam("成员信息不存在!请检查");
         }
-        BlinkActivityMemberDTO dto = new BlinkActivityMemberDTO();
-        mapper.toBlinkActivityMemberDTO(activityMemberDO, dto);
-        return ResponseDTO.ok(dto);
+        return ResponseDTO.ok(activityMemberDTO);
     }
 
     /**
@@ -116,7 +114,7 @@ public class BlinkActivityMemberServiceImpl extends ServiceImpl<BlinkActivityMem
             return ResponseDTO.dataErrorParam("成员不存在!请检查");
         }
         // 执行假删除
-        repository.supportsActivityMemberDeleteById(id);
+        activityMemberDO.setDeletedFlag(1);
         // 修改人赋值
         BlinkEntityUtil.setUpdatedInfo(activityMemberDO);
         this.updateById(activityMemberDO);

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkProviderServiceImpl.java

@@ -32,6 +32,9 @@ public class BlinkProviderServiceImpl extends ServiceImpl<BlinkProviderRepositor
 
     @Override
     public ResponseDTO<String> supportsProviderCreate(BlinkProviderDTO dto) {
+        if(dto.getProviderType().equals("01")){
+            dto.setProviderName(dto.getContactPeople());
+        }
         // 验证服务商名称是否重复
         BlinkProviderDO providerDO = repository.queryByProviderName(dto.getProviderName(), null, Boolean.FALSE);
         if (Objects.nonNull(providerDO)) {

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/objectmapper/BlinkActivityAttachmentMapper.java

@@ -0,0 +1,28 @@
+package com.wx.blink.backend.objectmapper;
+
+import com.wx.blink.backend.domain.dataobject.BlinkActivityAttachmentDO;
+import com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO;
+import com.wx.blink.base.common.util.BlinkStringUtil;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+
+@Mapper(componentModel = "spring", imports = {BlinkStringUtil.class})
+public interface BlinkActivityAttachmentMapper {
+
+    /**
+     * 活动附件主数据dto转do
+     *
+     * @param dto
+     * @return
+     */
+    void toBlinkActivityAttachmentDO(BlinkActivityAttachmentDTO dto, @MappingTarget BlinkActivityAttachmentDO attachmentDO);
+
+    /**
+     * 活动附件主数据do转dto
+     *
+     * @param dto
+     * @return
+     */
+    void toBlinkActivityAttachmentDTO(BlinkActivityAttachmentDO attachmentDO, @MappingTarget BlinkActivityAttachmentDTO dto);
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkActivityAttachmentRepository.java

@@ -0,0 +1,31 @@
+package com.wx.blink.backend.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wx.blink.backend.domain.dataobject.BlinkActivityAttachmentDO;
+import com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO;
+import com.wx.blink.backend.domain.qry.BlinkActivityAttachmentQry;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BlinkActivityAttachmentRepository extends BaseMapper<BlinkActivityAttachmentDO> {
+
+    /**
+     * 分页查询活动附件列表
+     *
+     * @param qry
+     * @return
+     */
+    List<BlinkActivityAttachmentDTO> supportsActivityAttachmentQueryPage(Page<?> page, @Param("query") BlinkActivityAttachmentQry qry);
+
+    /**
+     * 获取活动附件信息
+     *
+     * @param id
+     * @return
+     */
+    BlinkActivityAttachmentDTO supportsActivityAttachmentQuery(@Param("id") Long id);
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkActivityMemberRepository.java

@@ -33,11 +33,11 @@ public interface BlinkActivityMemberRepository extends BaseMapper<BlinkActivityM
     List<BlinkActivityMemberDTO> supportsActivityMemberQueryPage(Page<?> page, @Param("query") BlinkActivityMemberQry qry);
 
     /**
-     * 移除服务成员
+     * 获取服务成员信息
      *
      * @param id
      * @return
      */
-    void supportsActivityMemberDeleteById(@Param("id") Long id);
+    BlinkActivityMemberDTO supportsActivityMemberQuery(@Param("id") Long id);
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/CountryRepository.java

@@ -0,0 +1,9 @@
+package com.wx.blink.backend.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wx.blink.backend.domain.dataobject.CountryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CountryRepository extends BaseMapper<CountryDO> {
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkActivityAttachmentService.java

@@ -0,0 +1,42 @@
+package com.wx.blink.backend.service;
+
+import com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO;
+import com.wx.blink.backend.domain.qry.BlinkActivityAttachmentQry;
+import com.wx.blink.base.common.domain.PageResult;
+import com.wx.blink.base.common.domain.ResponseDTO;
+
+public interface IBlinkActivityAttachmentService {
+
+    /**
+     * 新增附件
+     *
+     * @param dto
+     * @return
+     */
+    ResponseDTO<String> supportsActivityAttachmentCreate(BlinkActivityAttachmentDTO dto);
+
+    /**
+     * 分页查询活动附件列表
+     *
+     * @param qry
+     * @return
+     */
+    ResponseDTO<PageResult<BlinkActivityAttachmentDTO>> supportsActivityAttachmentQueryPage(BlinkActivityAttachmentQry qry);
+
+    /**
+     * 获取附件信息
+     *
+     * @param id
+     * @return
+     */
+    ResponseDTO<BlinkActivityAttachmentDTO> supportsActivityAttachmentQuery(Long id);
+
+    /**
+     * 移除活动附件
+     *
+     * @param id
+     * @return
+     */
+    ResponseDTO<String> supportsActivityAttachmentDeleteById(Long id);
+
+}

bound-link-api/blink-backend/src/main/resources/mapper/BlinklActivityAttachmentRepositoryMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wx.blink.backend.repository.BlinkActivityAttachmentRepository">
+
+    <!--    分页查询活动附件列表-->
+    <select id="supportsActivityAttachmentQueryPage" resultType="com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO">
+        select *
+        from blink_activity_attachment
+        where deleted_flag = '0'
+        <if test="query.type != null and query.type !=''">
+            AND type = #{query.type}
+        </if>
+        <if test="query.activityId != null">
+            AND activity_id = #{query.activityId}
+        </if>
+        order by create_time desc
+    </select>
+
+
+
+    <!--    获取活动附件信息-->
+    <select id="supportsActivityAttachmentQuery" resultType="com.wx.blink.backend.domain.dto.BlinkActivityAttachmentDTO">
+        select *
+        from blink_activity_attachment
+        where deleted_flag = '0'
+        <if test="id != null">
+            AND id = #{id}
+        </if>
+    </select>
+
+</mapper>

bound-link-api/blink-backend/src/main/resources/mapper/BlinklActivityMemberRepositoryMapper.xml

@@ -25,10 +25,14 @@
         order by create_time desc
     </select>
 
-    <update id="supportsActivityMemberDeleteById">
-        UPDATE blink_activity_member
-        SET deleted_flag = 1
-        WHERE id = #{id}
-    </update>
+    <!--    获取服务成员信息-->
+    <select id="supportsActivityMemberQuery" resultType="com.wx.blink.backend.domain.dto.BlinkActivityMemberDTO">
+        select *
+        from blink_activity_member
+        where deleted_flag = '0'
+        <if test="id != null">
+            AND id = #{id}
+        </if>
+    </select>
 
 </mapper>

bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/controller/DictController.java

@@ -1,5 +1,6 @@
 package com.wx.blink.base.module.support.dict.controller;
 
+import com.wx.blink.base.common.annoation.NoNeedLogin;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import com.wx.blink.base.common.controller.SupportBaseController;
@@ -67,6 +68,7 @@ public class DictController extends SupportBaseController {
 
     @Operation(summary = "查询数据字典所有key-value- @author admin")
     @GetMapping("/dict/category/query")
+    @NoNeedLogin
     public ResponseDTO<ConcurrentHashMap<String, List<DictValueVO>>> allDictQuery(){
         return dictCacheService.allDictQuery();
     }

bound-link-api/blink-portal-api/src/main/java/com/wx/blink/portal/ProviderApi.java

@@ -1,5 +1,6 @@
 package com.wx.blink.portal;
 
+import com.wx.blink.base.common.annoation.NoNeedLogin;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.common.dto.BlinkProviderDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @FeignClient(value = "Provider-BackEnd", url = "127.0.0.1:9000")
 public interface ProviderApi {
 
+    @NoNeedLogin
     @RequestMapping(value = "/supports/provider/create")
     public ResponseDTO<String> providerCreate(@RequestBody BlinkProviderDTO dto);
 }

bound-link-api/blink-portal/src/main/java/com/wx/blink/portal/controller/PortalController.java

@@ -11,6 +11,7 @@ import com.wx.blink.portal.service.IPortalService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -31,14 +32,14 @@ public class PortalController {
     }
 
     @Operation(summary = "通知列表")
-    @GetMapping("/portal/board/notice/queryPage")
-    public ResponseDTO<PageResult<PortalWorkBoardNoticeVO>> portalBoardNoticeQueryPage(CommonQry qry) {
+    @PostMapping("/portal/board/notice/queryPage")
+    public ResponseDTO<PageResult<PortalWorkBoardNoticeVO>> portalBoardNoticeQueryPage(@RequestBody CommonQry qry) {
         return portalService.portalBoardNoticeQueryPage(qry);
     }
 
     @Operation(summary = "消息列表")
-    @GetMapping("/portal/board/message/queryPage")
-    public ResponseDTO<PageResult<PortalWorkBoardMessageVO>> portalBoardMessageQueryPage(CommonQry qry) {
+    @PostMapping("/portal/board/message/queryPage")
+    public ResponseDTO<PageResult<PortalWorkBoardMessageVO>> portalBoardMessageQueryPage(@RequestBody CommonQry qry) {
         return portalService.portalBoardMessageQueryPage(qry);
     }
 }

bound-link-api/blink-portal/src/main/java/com/wx/blink/portal/domain/vo/PortalWorkBoardVO.java

@@ -1,5 +1,6 @@
 package com.wx.blink.portal.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wx.blink.base.common.json.serializer.EmployeeLoginNameVoDeserializer;
 import lombok.Data;
@@ -94,6 +95,7 @@ public class PortalWorkBoardVO {
     /**
      * 注册日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date registerDate;
 
     /**

bound-link-api/blink-portal/src/main/java/com/wx/blink/portal/manager/PortalServiceImpl.java

@@ -107,6 +107,10 @@ public class PortalServiceImpl implements IPortalService {
         }};
         contract.setElementValue(contractElementValue);
         board.setContract(contract);
+        //注册信息
+        board.setRegisterDate(DateTime.now());
+        board.setCooperationDays(120);
+        board.setCustomerManager("hanxiaohui");
         return ResponseDTO.ok(board);
     }