fix: 重置密码无法登录

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -191,7 +191,7 @@ public class CompanyController extends BaseController
     public AjaxResult resetPwd(@PathVariable Long companyId)
     {
         Company company=companyService.selectCompanyById(companyId);
-        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),SecurityUtils.encryptPassword("123456")));
+        return toAjax(userService.resetUserPwdByUserId(company.getUserId(),"$2a$10$PYuQ7.6jxFlh5qRaDCsBzuIjQFYAFEQfmRFM5yj0Wd4/GE3hqRgZq"));
     }
 
 //    @PreAuthorize("@ss.hasPermi('company:company:resetMoney')")

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1867,6 +1867,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     return;
                 }
                 erpOrder.setWarehouse_code(warehouseCode);
+                order.setStoreHouseCode(warehouseCode);
             }
 
         }
@@ -1887,6 +1888,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 logger.error("当前订单 {} 的仓库id不存在!",order.getId());
                 return;
             }
+            order.setStoreHouseCode(warehouseCode);
             erpOrder.setWarehouse_code(warehouseCode);
         }