Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-10 95668edbe2d05516c7b91ebb7bba02f715328b78

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java

@@ -175,5 +175,5 @@
     * @return 登录结果
     */
    @PostMapping("/loginBatteryUser")
    R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password);
    R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid);
}