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

rk

65 分钟以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 server/platform/src/main/java/com/doumee/api/business/LocksController.java

@@ -120,7 +120,7 @@

    @ApiOperation("获取锁止器小程序二维码")
    @GetMapping("/findLockBase")
    public ApiResponse<List<Locks>> findLockBase64List(@RequestParam String siteId,@RequestParam  Integer fouce){
    public ApiResponse<List<Locks>> findLockBase64List(@RequestParam String siteId,@RequestParam(required = false)  Integer fouce){
        Locks locks = new Locks();
        locks.setSiteId(siteId);
        locks.setFource(fouce);