Merge branch 'master-jiayan' into master-jiayan-test

fwq

2024-09-03 eee1e8b17bbc314aae7d5a312065395933cc729c

Merge branch 'master-jiayan' into master-jiayan-test

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiAppReportService.java

@@ -77,13 +77,13 @@
    Result updateProject(@RequestBody AppointmentVisitVo appointmentVisitVo);

    /**
     * 门店升级VIP（含当日准会员升级）
     * 门店升级VIP（含当日准会升级）
     */
    @PostMapping("/report/appointment/level/upgrade")
    Result levelUpgrade(@RequestBody AppointmentVisitVo appointmentVisitVo);

    /**
     * 升级VIP（含当日准会员升级）
     * 升级VIP（含当日准会升级）
     */
    @PostMapping("/report/appointment/up/level")
    Result upLevel(@RequestBody AppointmentVisitVo appointmentVisitVo);

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -26,6 +26,8 @@
    private String hisNo;
    /**用户会员等级id*/
    private String memberLevelId;
    /**是否vip*/
    private Integer isVip = 0;
    /**用户会员等级名称*/
    private String memberName;
    /**用户会员等级图标*/