Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 17870eeeca47c08244b244c0acb7fe3f3216621f

 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);
}