huanghongfa
2021-06-08 7c568c51d789aac16d2b059825e1cb0a44d232ef
Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
2个文件已修改
3 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
@@ -51,7 +51,7 @@
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
    @NotNull(message = "上报人不能为空")
    //@NotNull(message = "上报人不能为空")
    private Long gridMemberId;
    @Length(max=255)
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1838,6 +1838,7 @@
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO) {
        if(commonEventDirectReportDTO.getEventId()!=null){