no

DESKTOP-71BH0QO\L、ming

2021-04-20 566a4425ddc50dec62d9f47c7270131cf88b935e

no

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java

@@ -131,7 +131,7 @@
        changePasswordVO.setUserId(user.getUserId());
        changePasswordVO.setNewPassword(storeVO.getStorePassword());
        R r = userService.changePassword(changePasswordVO);
        if (R.isOk(r)) {
        if (R.isOk(r)||r.getMsg().equals("新密码与原密码不能相同")){
            return communityService.editStore(storeVO, id);
        }
        return R.fail();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -361,6 +361,7 @@
     * @param id 商铺Id
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("editShopGoods/{id}")
    public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
        return comShopGoodsService.editShopGoods(id, addShopGoodsVO);