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

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsAttnController.java

@@ -57,6 +57,18 @@ public class CorpsAttnController extends BladeController {
 	}
 
 	/**
+	 * 根据客户id查询list
+	 */
+	@GetMapping("/list/{id}")
+	public R<CorpsAttn> getById(@PathVariable("id") Long id) {
+		List<CorpsAttn> list = corpsAttnService.list(new QueryWrapper<CorpsAttn>().eq("pid", id).eq("is_deleted", 0).eq("status", 0));
+		if (!list.isEmpty()) {
+			return R.data(list.get(0));
+		}
+		return null;
+	}
+
+	/**
 	 * 分页 客户联系人
 	 */
 	@GetMapping("/list")