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

jiaosong

2023-10-18 dbd141aa06a85255117ebeb812a0fc4a8ef541f2

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

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

}