Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-06-08 9453577b836e136807a1d7db12cce0ea5b3c8edc

Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -142,4 +142,6 @@
     * 网格综治-默认角色权限默认字符串
     */
    public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";

    public static final String ZONG_ZHI_GRID_MEMBER_IMAGE_URL = "http://image.panzhihua.nhys.cdnhxx.com//idcard/15a0563a7a1d42768322c95e5cb022c4.jpg";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComActEasyPhotoVO.java

@@ -83,6 +83,9 @@
    @ApiModelProperty(value = "发布人头像")
    private String imageUrl;

    @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
    private String lngLat;

    @ApiModelProperty(value = "随手拍类型列表")
    private List<String> easyPhotoList;


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EasyPhotoApi.java

@@ -5,7 +5,7 @@
import com.panzhihua.common.model.dtos.grid.PageEasyAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/ComActEasyPhotoMapper.xml

@@ -89,6 +89,7 @@
        caep.handle_result,
        caep.handle_photo_list,
        caep.feedback_at,
        caep.lng_lat,
        caep.handler_id,
        su1.`name` AS handlerName,
        caep.is_report

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1917,6 +1917,9 @@
            sysUserDO.setName(sysUserDO.getNickName());
        }
        sysUserDO.setType(6);
        if(StringUtils.isEmpty(eventGridMemberAddDTO.getImageUrl())){
            sysUserDO.setImageUrl(Constants.ZONG_ZHI_GRID_MEMBER_IMAGE_URL);
        }
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);