Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java

@@ -114,4 +114,12 @@
     * @return 登录结果
     */
    LoginReturnsVO loginAlarmApp(String account, String password);

    /**
     * 便民服务商家后台登录
     * @param account 账户
     * @param password 密码
     * @return 登录结果
     */
    LoginReturnVO loginMerchantBackStage(String account, String password);
}