Merge remote-tracking branch 'origin/master'

jiangping

2024-07-16 53e0cba6de254a1d6f19d0287da0b212f4a5ae90

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java

@@ -19,6 +19,6 @@
    private String token;
    private String openId;
    @ApiModelProperty(value = "用户主键" , hidden = true)
    private Long userId;
    private String userId;

}