Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java

@@ -266,6 +266,7 @@ public class EquipmentLedgerController extends DafController {
 		if (StringUtils.isNotEmpty(coding)) {
 			queryWrapper.lambda().like(EquipmentLedger::getKksEncoding, coding);
 		}
+		queryWrapper.lambda().eq(EquipmentLedger::getCheckStatus, 2);
 		queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
 		queryWrapper.lambda().orderByDesc(EquipmentLedger::getKksEncoding);
 		queryWrapper.lambda().last(" LIMIT 50");

src/main/java/org/energy/modules/system/service/impl/UserServiceImpl.java

@@ -138,7 +138,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	@Override
 	public boolean resetPassword(String userIds) {
 		User user = new User();
-		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+//		user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+		user.setPassword(DigestUtil.encrypt("8Nn!yjWKpR"));
 		user.setUpdateTime(DateUtil.now());
 		return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
 	}