Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

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

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.vos.LoginReturnVO;
import com.panzhihua.common.model.vos.LoginReturnsVO;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -155,5 +156,5 @@
     *            密码
     * @return 登录结果
     */
    LoginReturnVO loginBatteryUser(String account, String password);
    LoginReturnVO loginBatteryUser(String account, String password,String appid);
}