Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.dtos.community.sanshuo;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -15,6 +17,7 @@
     * id
     */
    @ApiModelProperty("id,修改时传")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -129,6 +132,7 @@
     */
    @ApiModelProperty("所属单位")
    private String unit;
    private String unitId;