Merge branch 'master-base' into master-fwq-爆款活动2.0

fwq

2024-07-17 cb7bf61ddec695b25f8fe509815c5e5794180b0f

 phis-feign/src/main/java/com/hz/his/dto/token/GetTokenDto.java

@@ -9,5 +9,7 @@
    private String corpId;
    /**小程序appid*/
    private String mpId;
    /**公众号的appid*/
    private String weChatAppId;

}