Merge remote-tracking branch 'origin/master'

doum

2026-04-22 4f604171623fb28f81bfcec07bd25737d7284649

 server/services/src/main/java/com/doumee/service/business/ShopInfoService.java

@@ -193,10 +193,10 @@
    ShopLoginVO shopPasswordLogin(ShopLoginDTO dto);

    /**
     * 门店静默登录（根据openid）
     * @param openid
     * 门店静默登录（默认用户携带的openid进行查询）
     * @param memberId
     * @return 登录结果
     */
    ShopLoginVO shopSilentLogin(String openid);
    ShopLoginVO shopSilentLogin(Integer memberId);

}