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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

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

@@ -14,7 +14,7 @@

    /**
     * 创建
     * 
     *
     * @param locks 实体对象
     * @return String
     */
@@ -78,7 +78,16 @@
     * @return List<Locks>
     */
    List<Locks> findList(Locks locks);
  


    /**
     * 条件查询
     *
     * @param locks 实体对象
     * @return List<Locks>
     */
    List<Locks> findLockBase64List(Locks locks);

    /**
     * 分页查询
     *