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

jiaosong

2023-10-17 f1843f0cd53ab6dd749ad71db8e18590ceff98d8

 server/services/src/main/java/com/doumee/service/business/LocksService.java

@@ -94,4 +94,5 @@
     * @return long
     */
    long count(Locks locks);

}